Merge branch 'staging' of https://github.com/joomla/joomla-cms into s…

…taging

administrator/components/com_categories/models/category.php

@@ -572,7 +572,7 @@ public function save($data)
 		if ($assoc)
 		{
 			// Adding self to the association
-			$associations = $data['associations'];
+			$associations = isset($data['associations']) ? $data['associations'] : array();
 
 			// Unset any invalid associations
 			$associations = Joomla\Utilities\ArrayHelper::toInteger($associations);

administrator/components/com_finder/finder.xml

@@ -21,7 +21,6 @@
 	</files>
 	<media destination="com_finder" folder="media">
 		<folder>js</folder>
-		<folder>images</folder>
 		<folder>css</folder>
 	</media>
 	<install>

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

@@ -135,7 +135,6 @@
 			id="access"
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
-			default="1"
 			filter="integer"/>
 
 

administrator/components/com_menus/models/item.php

@@ -593,7 +593,7 @@ protected function loadFormData()
 			$filters = JFactory::getApplication()->getUserState('com_menus.items.filter');
 			$data['published'] = (isset($filters['published']) ? $filters['published'] : null);
 			$data['language'] = (isset($filters['language']) ? $filters['language'] : null);
-			$data['access'] = (isset($filters['access']) ? $filters['access'] : null);
+			$data['access'] = (isset($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access'));
 		}
 
 		if (isset($data['menutype']) && !$this->getState('item.menutypeid'))

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

@@ -160,6 +160,7 @@ JERROR_CORE_DELETE_NOT_PERMITTED="Delete not permitted."
 JERROR_COULD_NOT_FIND_TEMPLATE="Could not find template "_QQ_"%s"_QQ_"."
 JERROR_INVALID_CONTROLLER="Invalid controller"
 JERROR_INVALID_CONTROLLER_CLASS="Invalid controller class"
+JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error"
 JERROR_LOADFILE_FAILED="Error loading form file"
 JERROR_LOADING_MENUS="Error loading Menus: %s"
 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

@@ -5,15 +5,15 @@
 
 PLG_SYSTEM_LANGUAGEFILTER="System - Language Filter"
 PLG_SYSTEM_LANGUAGEFILTER_BROWSER_SETTINGS="Browser Settings"
-PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_DESC="Add alternative meta tags for menu items with associated menu items in other languages."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_DESC="Add alternative meta tags for items with associated items in other languages."
 PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_LABEL="Add Alternate Meta Tags"
 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."
 PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_LABEL="Automatic Language Change"
 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."
 PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_LABEL="Cookie Lifetime"
 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."
 PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_LABEL="Language Selection for new Visitors"
-PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_DESC="This option will allow item associations when switching from one language to another."
+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."
 PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_LABEL="Item Associations"
 PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_DESC="This option will add x-default meta tag to improve SEO."
 PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LABEL="Add x-default Meta Tag"

administrator/templates/hathor/error.php

@@ -37,7 +37,24 @@
 		<p><?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
 		<p><a href="index.php"><?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
 		<?php if ($this->debug) : ?>
-			<?php echo $this->renderBacktrace(); ?>
+			<div>
+				<?php echo $this->renderBacktrace(); ?>
+				<?php // Check if there are more Exceptions and render their data as well ?>
+				<?php if ($this->error->getPrevious()) : ?>
+					<?php $loop = true; ?>
+					<?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 ?>
+					<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+					<?php $this->setError($this->_error->getPrevious()); ?>
+					<?php while ($loop === true) : ?>
+						<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+						<p><?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
+						<?php echo $this->renderBacktrace(); ?>
+						<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+					<?php endwhile; ?>
+					<?php // Reset the main error object to the base error ?>
+					<?php $this->setError($this->error); ?>
+				<?php endif; ?>
+			</div>
 		<?php endif; ?>
 	</div>
 	<div class="clr"></div>

administrator/templates/isis/error.php

@@ -234,7 +234,24 @@
 						<span class="label label-inverse"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8');?>
 					</blockquote>
 					<?php if ($this->debug) : ?>
-						<?php echo $this->renderBacktrace(); ?>
+						<div>
+							<?php echo $this->renderBacktrace(); ?>
+							<?php // Check if there are more Exceptions and render their data as well ?>
+							<?php if ($this->error->getPrevious()) : ?>
+								<?php $loop = true; ?>
+								<?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 ?>
+								<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+								<?php $this->setError($this->_error->getPrevious()); ?>
+								<?php while ($loop === true) : ?>
+									<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+									<p><?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
+									<?php echo $this->renderBacktrace(); ?>
+									<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+								<?php endwhile; ?>
+								<?php // Reset the main error object to the base error ?>
+								<?php $this->setError($this->error); ?>
+							<?php endif; ?>
+						</div>
 					<?php endif; ?>
 					<p><a href="<?php echo $this->baseurl; ?>" class="btn"><span class="icon-dashboard"></span> <?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
 					<!-- End Content -->

administrator/templates/system/error.php

@@ -29,11 +29,26 @@
 		<td width="39%" align="center">
 			<p><?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
 			<p><a href="index.php"><?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT') ?></a></p>
-			<p>
-				<?php if ($this->debug) :
-					echo $this->renderBacktrace();
-				endif; ?>
-			</p>
+			<?php if ($this->debug) : ?>
+				<div>
+					<?php echo $this->renderBacktrace(); ?>
+					<?php // Check if there are more Exceptions and render their data as well ?>
+					<?php if ($this->error->getPrevious()) : ?>
+						<?php $loop = true; ?>
+						<?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 ?>
+						<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+						<?php $this->setError($this->_error->getPrevious()); ?>
+						<?php while ($loop === true) : ?>
+							<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+							<p><?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
+							<?php echo $this->renderBacktrace(); ?>
+							<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+						<?php endwhile; ?>
+						<?php // Reset the main error object to the base error ?>
+						<?php $this->setError($this->error); ?>
+					<?php endif; ?>
+				</div>
+			<?php endif; ?>
 		</td>
 	</tr>
 	</table>

language/en-GB/en-GB.ini

@@ -118,6 +118,7 @@ JERROR_LAYOUT_NOT_ABLE_TO_VISIT="You may not be able to visit this page because
 JERROR_LAYOUT_PAGE_NOT_FOUND="The requested page can't be found."
 JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR="If difficulties persist, please contact the System Administrator of this site and report the error below."
 JERROR_LAYOUT_PLEASE_TRY_ONE_OF_THE_FOLLOWING_PAGES="Please try one of the following pages:"
+JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error"
 JERROR_LAYOUT_REQUESTED_RESOURCE_WAS_NOT_FOUND="The requested resource was not found."
 JERROR_LAYOUT_SEARCH="You may wish to search the site or visit the home page."
 JERROR_LAYOUT_SEARCH_ENGINE_OUT_OF_DATE_LISTING="a search engine that has an <strong>out-of-date listing for this site</strong>"