Skip to content

Commit 24e6c45

Browse files
brianteemanbrianteeman
committed
Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging
2 parents 962b424 + c1b0295 commit 24e6c45

File tree

223 files changed

+24267
-633
lines changed

Some content is hidden

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

223 files changed

+24267
-633
lines changed

‎administrator/components/com_categories/models/category.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ public function save($data)
572572
if ($assoc)
573573
{
574574
// Adding self to the association
575-
$associations = $data['associations'];
575+
$associations = isset($data['associations']) ? $data['associations'] : array();
576576

577577
// Unset any invalid associations
578578
$associations = Joomla\Utilities\ArrayHelper::toInteger($associations);

‎administrator/components/com_finder/finder.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
</files>
2222
<media destination="com_finder" folder="media">
2323
<folder>js</folder>
24-
<folder>images</folder>
2524
<folder>css</folder>
2625
</media>
2726
<install>

‎administrator/components/com_menus/models/forms/item.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
id="access"
136136
label="JFIELD_ACCESS_LABEL"
137137
description="JFIELD_ACCESS_DESC"
138-
default="1"
139138
filter="integer"/>
140139

141140

‎administrator/components/com_menus/models/item.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ protected function loadFormData()
593593
$filters = JFactory::getApplication()->getUserState('com_menus.items.filter');
594594
$data['published'] = (isset($filters['published']) ? $filters['published'] : null);
595595
$data['language'] = (isset($filters['language']) ? $filters['language'] : null);
596-
$data['access'] = (isset($filters['access']) ? $filters['access'] : null);
596+
$data['access'] = (isset($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access'));
597597
}
598598

599599
if (isset($data['menutype']) && !$this->getState('item.menutypeid'))

‎administrator/language/en-GB/en-GB.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ JERROR_CORE_DELETE_NOT_PERMITTED="Delete not permitted."
160160
JERROR_COULD_NOT_FIND_TEMPLATE="Could not find template "_QQ_"%s"_QQ_"."
161161
JERROR_INVALID_CONTROLLER="Invalid controller"
162162
JERROR_INVALID_CONTROLLER_CLASS="Invalid controller class"
163+
JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error"
163164
JERROR_LOADFILE_FAILED="Error loading form file"
164165
JERROR_LOADING_MENUS="Error loading Menus: %s"
165166
JERROR_LOGIN_DENIED="You do not have access to the Administrator section of this site."

‎administrator/language/en-GB/en-GB.plg_system_languagefilter.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
PLG_SYSTEM_LANGUAGEFILTER="System - Language Filter"
77
PLG_SYSTEM_LANGUAGEFILTER_BROWSER_SETTINGS="Browser Settings"
8-
PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_DESC="Add alternative meta tags for menu items with associated menu items in other languages."
8+
PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_DESC="Add alternative meta tags for items with associated items in other languages."
99
PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_LABEL="Add Alternate Meta Tags"
1010
PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_DESC="This option will automatically change the content language used in the Frontend when a user site language is changed."
1111
PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_LABEL="Automatic Language Change"
1212
PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_DESC="Language cookies can be set to expire at the end of the session or after a year. Default is session."
1313
PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_LABEL="Cookie Lifetime"
1414
PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_DESC="Choose site default language or try to detect the browser settings language. It will default to site language if browser settings can't be found."
1515
PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_LABEL="Language Selection for new Visitors"
16-
PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_DESC="This option will allow item associations when switching from one language to another."
16+
PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_DESC="This option will allow item associations when switching from one language to another. Default home menu items are always associated."
1717
PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_LABEL="Item Associations"
1818
PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_DESC="This option will add x-default meta tag to improve SEO."
1919
PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LABEL="Add x-default Meta Tag"

‎administrator/templates/hathor/error.php‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,24 @@
3737
<p><?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
3838
<p><a href="index.php"><?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
3939
<?php if ($this->debug) : ?>
40-
<?php echo $this->renderBacktrace(); ?>
40+
<div>
41+
<?php echo $this->renderBacktrace(); ?>
42+
<?php // Check if there are more Exceptions and render their data as well ?>
43+
<?php if ($this->error->getPrevious()) : ?>
44+
<?php $loop = true; ?>
45+
<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
46+
<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
47+
<?php $this->setError($this->_error->getPrevious()); ?>
48+
<?php while ($loop === true) : ?>
49+
<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
50+
<p><?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
51+
<?php echo $this->renderBacktrace(); ?>
52+
<?php $loop = $this->setError($this->_error->getPrevious()); ?>
53+
<?php endwhile; ?>
54+
<?php // Reset the main error object to the base error ?>
55+
<?php $this->setError($this->error); ?>
56+
<?php endif; ?>
57+
</div>
4158
<?php endif; ?>
4259
</div>
4360
<div class="clr"></div>

‎administrator/templates/isis/error.php‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,24 @@
234234
<span class="label label-inverse"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8');?>
235235
</blockquote>
236236
<?php if ($this->debug) : ?>
237-
<?php echo $this->renderBacktrace(); ?>
237+
<div>
238+
<?php echo $this->renderBacktrace(); ?>
239+
<?php // Check if there are more Exceptions and render their data as well ?>
240+
<?php if ($this->error->getPrevious()) : ?>
241+
<?php $loop = true; ?>
242+
<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
243+
<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
244+
<?php $this->setError($this->_error->getPrevious()); ?>
245+
<?php while ($loop === true) : ?>
246+
<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
247+
<p><?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
248+
<?php echo $this->renderBacktrace(); ?>
249+
<?php $loop = $this->setError($this->_error->getPrevious()); ?>
250+
<?php endwhile; ?>
251+
<?php // Reset the main error object to the base error ?>
252+
<?php $this->setError($this->error); ?>
253+
<?php endif; ?>
254+
</div>
238255
<?php endif; ?>
239256
<p><a href="<?php echo $this->baseurl; ?>" class="btn"><span class="icon-dashboard"></span> <?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
240257
<!-- End Content -->

‎administrator/templates/system/error.php‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,26 @@
2929
<td width="39%" align="center">
3030
<p><?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
3131
<p><a href="index.php"><?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT') ?></a></p>
32-
<p>
33-
<?php if ($this->debug) :
34-
echo $this->renderBacktrace();
35-
endif; ?>
36-
</p>
32+
<?php if ($this->debug) : ?>
33+
<div>
34+
<?php echo $this->renderBacktrace(); ?>
35+
<?php // Check if there are more Exceptions and render their data as well ?>
36+
<?php if ($this->error->getPrevious()) : ?>
37+
<?php $loop = true; ?>
38+
<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
39+
<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
40+
<?php $this->setError($this->_error->getPrevious()); ?>
41+
<?php while ($loop === true) : ?>
42+
<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
43+
<p><?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
44+
<?php echo $this->renderBacktrace(); ?>
45+
<?php $loop = $this->setError($this->_error->getPrevious()); ?>
46+
<?php endwhile; ?>
47+
<?php // Reset the main error object to the base error ?>
48+
<?php $this->setError($this->error); ?>
49+
<?php endif; ?>
50+
</div>
51+
<?php endif; ?>
3752
</td>
3853
</tr>
3954
</table>

‎language/en-GB/en-GB.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ JERROR_LAYOUT_NOT_ABLE_TO_VISIT="You may not be able to visit this page because
118118
JERROR_LAYOUT_PAGE_NOT_FOUND="The requested page can't be found."
119119
JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR="If difficulties persist, please contact the System Administrator of this site and report the error below."
120120
JERROR_LAYOUT_PLEASE_TRY_ONE_OF_THE_FOLLOWING_PAGES="Please try one of the following pages:"
121+
JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error"
121122
JERROR_LAYOUT_REQUESTED_RESOURCE_WAS_NOT_FOUND="The requested resource was not found."
122123
JERROR_LAYOUT_SEARCH="You may wish to search the site or visit the home page."
123124
JERROR_LAYOUT_SEARCH_ENGINE_OUT_OF_DATE_LISTING="a search engine that has an <strong>out-of-date listing for this site</strong>"

0 commit comments

Comments
 (0)