Skip to content

Commit 1ad0aac

Browse files
bembelimenbembelimen
committed
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
2 parents 0c27736 + 2e9bc7e commit 1ad0aac

File tree

89 files changed

+157
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+157
-170
lines changed

‎administrator/components/com_admin/script.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5861,7 +5861,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
58615861
'/media/com_fields/js/admin-field-edit-modal.min.js.gz',
58625862
// 4.0 from RC 3 to RC 4
58635863
'/components/com_contact/layouts/joomla/form/renderfield.php',
5864-
'/libraries/src/Http/Transport/cacert.pem'
5864+
'/language/en-GB/com_messages.ini',
5865+
'/libraries/src/Http/Transport/cacert.pem',
58655866
);
58665867

58675868
$folders = array(

‎administrator/components/com_banners/src/View/Clients/HtmlView.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ protected function addToolbar(): void
162162
}
163163
}
164164

165-
if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete'))
165+
if (!$this->isEmptyState && $this->state->get('filter.state') == -2 && $canDo->get('core.delete'))
166166
{
167167
$toolbar->delete('clients.delete')
168168
->text('JTOOLBAR_EMPTY_TRASH')

‎administrator/components/com_cache/src/View/Cache/HtmlView.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ class HtmlView extends BaseHtmlView
8383
*
8484
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
8585
*
86-
* @return mixed A string if successful, otherwise an Error object.
86+
* @return void
8787
*
8888
* @since 1.6
8989
*
90-
* @throws Exception
90+
* @throws GenericDataException
9191
*/
9292
public function display($tpl = null): void
9393
{

‎administrator/components/com_categories/src/View/Categories/HtmlView.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ class HtmlView extends BaseHtmlView
8484
*
8585
* @param string|null $tpl The name of the template file to parse; automatically searches through the template paths.
8686
*
87-
* @return mixed A string if successful, otherwise an Error object.
87+
* @throws GenericDataException
88+
*
89+
* @return void
8890
*/
8991
public function display($tpl = null)
9092
{
@@ -139,7 +141,7 @@ public function display($tpl = null)
139141
}
140142
}
141143

142-
return parent::display($tpl);
144+
parent::display($tpl);
143145
}
144146

145147
/**

‎administrator/components/com_categories/src/View/Category/HtmlView.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class HtmlView extends BaseHtmlView
7676
*
7777
* @param string|null $tpl The name of the template file to parse; automatically searches through the template paths.
7878
*
79-
* @return mixed A string if successful, otherwise an Error object.
79+
* @return void
8080
*/
8181
public function display($tpl = null)
8282
{
@@ -117,7 +117,7 @@ public function display($tpl = null)
117117

118118
$this->addToolbar();
119119

120-
return parent::display($tpl);
120+
parent::display($tpl);
121121
}
122122

123123
/**

‎administrator/components/com_checkin/src/View/Checkin/HtmlView.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class HtmlView extends BaseHtmlView
7474
*
7575
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
7676
*
77-
* @return mixed A string if successful, otherwise an Error object.
77+
* @return void
7878
*/
7979
public function display($tpl = null)
8080
{
@@ -99,7 +99,7 @@ public function display($tpl = null)
9999

100100
$this->addToolbar();
101101

102-
return parent::display($tpl);
102+
parent::display($tpl);
103103
}
104104

105105
/**

‎administrator/components/com_config/src/View/Application/HtmlView.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class HtmlView extends BaseHtmlView
5454
*
5555
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
5656
*
57-
* @return mixed A string if successful, otherwise an Error object.
57+
* @return void
5858
*
5959
* @see \JViewLegacy::loadTemplate()
6060
* @since 3.0
@@ -101,7 +101,7 @@ public function display($tpl = null)
101101

102102
$this->addToolbar();
103103

104-
return parent::display($tpl);
104+
parent::display($tpl);
105105
}
106106

107107
/**

‎administrator/components/com_config/src/View/Component/HtmlView.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class HtmlView extends BaseHtmlView
5353
*
5454
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
5555
*
56-
* @return mixed A string if successful, otherwise an Error object.
56+
* @return void
5757
*
5858
* @see \JViewLegacy::loadTemplate()
5959
* @since 3.2
@@ -102,7 +102,7 @@ public function display($tpl = null)
102102

103103
$this->addToolbar();
104104

105-
return parent::display($tpl);
105+
parent::display($tpl);
106106
}
107107

108108
/**

‎administrator/components/com_contact/src/View/Contact/HtmlView.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class HtmlView extends BaseHtmlView
5353
*
5454
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
5555
*
56-
* @return mixed A string if successful, otherwise an Error object.
56+
* @return void
5757
*/
5858
public function display($tpl = null)
5959
{
@@ -84,7 +84,7 @@ public function display($tpl = null)
8484

8585
$this->addToolbar();
8686

87-
return parent::display($tpl);
87+
parent::display($tpl);
8888
}
8989

9090
/**

‎administrator/components/com_contact/src/View/Contacts/HtmlView.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class HtmlView extends BaseHtmlView
7575
*
7676
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
7777
*
78-
* @return mixed A string if successful, otherwise an Error object.
78+
* @return void
7979
*/
8080
public function display($tpl = null)
8181
{
@@ -134,7 +134,7 @@ public function display($tpl = null)
134134
}
135135
}
136136

137-
return parent::display($tpl);
137+
parent::display($tpl);
138138
}
139139

140140
/**
@@ -178,7 +178,7 @@ protected function addToolbar()
178178
->text('JFEATURE')
179179
->task('contacts.featured')
180180
->listCheck(true);
181-
$childBar->standardButton('circle')
181+
$childBar->standardButton('unfeatured')
182182
->text('JUNFEATURE')
183183
->task('contacts.unfeatured')
184184
->listCheck(true);

0 commit comments

Comments
 (0)