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

…taging
joomla · Aug 23, 2016 · 4856d5e · 4856d5e
2 parents 4ddd833 + f10ab35
commit 4856d5e
Show file tree

Hide file tree

Showing 279 changed files with 3,546 additions and 393 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1427,6 +1427,9 @@ public function deleteUnexistingFiles()
 			'/administrator/templates/isis/js/bootstrap.min.js',
 			'/media/system/js/permissions.min.js',
 			'/libraries/platform.php',
+			// Joomla! 3.6.3
+			'/media/editors/codemirror/mode/jade/jade.js',
+			'/media/editors/codemirror/mode/jade/jade.min.js',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
@@ -1523,6 +1526,8 @@ public function deleteUnexistingFiles()
 			// Joomla 3.6
 			'/libraries/simplepie/idn',
 			'/libraries/simplepie',
+			// Joomla! 3.6.3
+			'/media/editors/codemirror/mode/jade',
 		);
 
 		jimport('joomla.filesystem.file');

diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php
@@ -56,16 +56,16 @@
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_BANNERS_BANNER_DETAILS')); ?>
 		<div class="row-fluid">
 			<div class="span9">
-				<?php echo $this->form->getControlGroup('type'); ?>
+				<?php echo $this->form->renderField('type'); ?>
 				<div id="image">
-					<?php echo $this->form->getControlGroups('image'); ?>
+					<?php echo $this->form->renderFieldset('image'); ?>
 				</div>
 				<div id="custom">
-					<?php echo $this->form->getControlGroup('custombannercode'); ?>
+					<?php echo $this->form->renderField('custombannercode'); ?>
 				</div>
 				<?php
-				echo $this->form->getControlGroup('clickurl');
-				echo $this->form->getControlGroup('description');
+				echo $this->form->renderField('clickurl');
+				echo $this->form->renderField('description');
 				?>
 			</div>
 			<div class="span3">
@@ -75,7 +75,7 @@
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'otherparams', JText::_('COM_BANNERS_GROUP_LABEL_BANNER_DETAILS')); ?>
-		<?php echo $this->form->getControlGroups('otherparams'); ?>
+		<?php echo $this->form->renderFieldset('otherparams'); ?>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
@@ -84,7 +84,7 @@
 				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
 			</div>
 			<div class="span6">
-				<?php echo $this->form->getControlGroups('metadata'); ?>
+				<?php echo $this->form->renderFieldset('metadata'); ?>
 			</div>
 		</div>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>

diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php
@@ -35,12 +35,12 @@
 		<div class="row-fluid">
 			<div class="span9">
 				<?php
-				echo $this->form->getControlGroup('contact');
-				echo $this->form->getControlGroup('email');
-				echo $this->form->getControlGroup('purchase_type');
-				echo $this->form->getControlGroup('track_impressions');
-				echo $this->form->getControlGroup('track_clicks');
-				echo $this->form->getControlGroups('extra');
+				echo $this->form->renderField('contact');
+				echo $this->form->renderField('email');
+				echo $this->form->renderField('purchase_type');
+				echo $this->form->renderField('track_impressions');
+				echo $this->form->renderField('track_clicks');
+				echo $this->form->renderFieldset('extra');
 				?>
 			</div>
 			<div class="span3">
@@ -50,7 +50,7 @@
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'metadata', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS')); ?>
-		<?php echo $this->form->getControlGroups('metadata'); ?>
+		<?php echo $this->form->renderFieldset('metadata'); ?>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 		<?php echo JHtml::_('bootstrap.endTabSet'); ?>

diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php
@@ -118,6 +118,11 @@ protected function getInput()
 		{
 			$linkCategories .= '&amp;forcedLanguage=' . $this->element['language'];
 			$linkCategory   .= '&amp;forcedLanguage=' . $this->element['language'];
+			$modalTitle = JText::_('COM_CATEGORIES_CHANGE_CATEGORY') . ' &#8212; ' . $this->element['label'];
+		}
+		else
+		{
+			$modalTitle = JText::_('COM_CATEGORIES_CHANGE_CATEGORY');
 		}
 
 		$urlSelect = $linkCategories . '&amp;' . JSession::getFormToken() . '=1';
@@ -144,7 +149,7 @@ protected function getInput()
 
 		if (empty($title))
 		{
-			$title = JText::_('COM_CATEGORIES_SELECT_A_CATEGORY');
+			$title = JText::_('COM_CATEGORIES_SELECT_A_CATEGORY', true);
 		}
 
 		$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
@@ -195,7 +200,7 @@ protected function getInput()
 			'bootstrap.renderModal',
 			'categorySelect' . $this->id . 'Modal',
 			array(
-				'title'       => JText::_('COM_CATEGORIES_SELECT_A_CATEGORY'),
+				'title'       => $modalTitle,
 				'url'         => $urlSelect,
 				'height'      => '400px',
 				'width'       => '800px',

diff --git a/administrator/components/com_content/views/article/tmpl/edit.php b/administrator/components/com_content/views/article/tmpl/edit.php
@@ -109,14 +109,14 @@
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'images', JText::_('COM_CONTENT_FIELDSET_URLS_AND_IMAGES')); ?>
 			<div class="row-fluid form-horizontal-desktop">
 				<div class="span6">
-					<?php echo $this->form->getControlGroup('images'); ?>
+					<?php echo $this->form->renderField('images'); ?>
 					<?php foreach ($this->form->getGroup('images') as $field) : ?>
-						<?php echo $field->getControlGroup(); ?>
+						<?php echo $field->renderField(); ?>
 					<?php endforeach; ?>
 				</div>
 				<div class="span6">
 					<?php foreach ($this->form->getGroup('urls') as $field) : ?>
-						<?php echo $field->getControlGroup(); ?>
+						<?php echo $field->renderField(); ?>
 					<?php endforeach; ?>
 				</div>
 			</div>

diff --git a/administrator/components/com_finder/views/filter/tmpl/edit.php b/administrator/components/com_finder/views/filter/tmpl/edit.php
@@ -21,7 +21,7 @@
 			Joomla.submitform(task, document.getElementById("adminForm"));
 		}
 	};
-	
+
 	jQuery(document).ready(function($) {
 		$("#rightbtn").on("click", function() {
 			if($(this).text() == "' . JText::_('COM_FINDER_FILTER_SHOW_ALL') . '") {
@@ -70,7 +70,7 @@
 			<div class="span9">
 				<?php if ($this->total > 0) : ?>
 					<div class="well">
-						<?php echo $this->form->getControlGroup('map_count'); ?>
+						<?php echo $this->form->renderField('map_count'); ?>
 					</div>
 					<button class="btn btn-default" type="button" class="jform-rightbtn" onclick="jQuery('.filter-node').each(function () { this.click(); });">
 						<span class="icon-checkbox-partial"></span> <?php echo JText::_('JGLOBAL_SELECTION_INVERT'); ?></button>

diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php
@@ -159,8 +159,7 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
 					  a.checked_out,
 					  a.language,
 					  a.lft')
-			->from('#__menu AS a')
-			->join('LEFT', $db->quoteName('#__menu') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
+			->from('#__menu AS a');
 
 		if (JLanguageMultilang::isEnabled())
 		{

diff --git a/administrator/components/com_menus/views/item/tmpl/edit.php b/administrator/components/com_menus/views/item/tmpl/edit.php
@@ -94,24 +94,24 @@
 		<div class="row-fluid">
 			<div class="span9">
 				<?php
-				echo $this->form->getControlGroup('type');
+				echo $this->form->renderField('type');
 
 				if ($this->item->type == 'alias')
 				{
-					echo $this->form->getControlGroups('aliasoptions');
+					echo $this->form->renderFieldset('aliasoptions');
 				}
 
-				echo $this->form->getControlGroups('request');
+				echo $this->form->renderFieldset('request');
 
 				if ($this->item->type == 'url')
 				{
 					$this->form->setFieldAttribute('link', 'readonly', 'false');
 				}
 
-				echo $this->form->getControlGroup('link');
+				echo $this->form->renderField('link');
 
-				echo $this->form->getControlGroup('browserNav');
-				echo $this->form->getControlGroup('template_style_id');
+				echo $this->form->renderField('browserNav');
+				echo $this->form->renderField('template_style_id');
 				?>
 			</div>
 			<div class="span3">

diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -228,7 +228,7 @@
 			</div>
 			<div class="span3">
 				<fieldset class="form-vertical">
-					<?php echo $this->form->getControlGroup('showtitle'); ?>
+					<?php echo $this->form->renderField('showtitle'); ?>
 					<div class="control-group">
 						<div class="control-label">
 							<?php echo $this->form->getLabel('position'); ?>

diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
@@ -55,8 +55,8 @@
 		<div class="row-fluid">
 			<div class="span9">
 				<div class="form-vertical">
-					<?php echo $this->form->getControlGroup('link'); ?>
-					<?php echo $this->form->getControlGroup('description'); ?>
+					<?php echo $this->form->renderField('link'); ?>
+					<?php echo $this->form->renderField('description'); ?>
 				</div>
 			</div>
 			<div class="span3">
@@ -68,9 +68,9 @@
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'images', JText::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS')); ?>
 		<div class="row-fluid">
 			<div class="span6">
-					<?php echo $this->form->getControlGroup('images'); ?>
+					<?php echo $this->form->renderField('images'); ?>
 					<?php foreach ($this->form->getGroup('images') as $field) : ?>
-						<?php echo $field->getControlGroup(); ?>
+						<?php echo $field->renderField(); ?>
 					<?php endforeach; ?>
 				</div>
 			</div>

diff --git a/administrator/components/com_tags/views/tag/tmpl/edit.php b/administrator/components/com_tags/views/tag/tmpl/edit.php
@@ -38,7 +38,7 @@
 		<div class="row-fluid">
 			<div class="span9">
 				<div class="form-vertical">
-					<?php echo $this->form->getControlGroup('description'); ?>
+					<?php echo $this->form->renderField('description'); ?>
 				</div>
 			</div>
 			<div class="span3">

diff --git a/administrator/language/en-GB/en-GB.com_categories.ini b/administrator/language/en-GB/en-GB.com_categories.ini
@@ -24,7 +24,7 @@ COM_CATEGORIES_CATEGORY_BASE_ADD_TITLE="Categories: New Category"
 COM_CATEGORIES_CATEGORY_BASE_EDIT_TITLE="Categories: Edit Category"
 COM_CATEGORIES_CATEGORY_EDIT_TITLE="%s: Edit Category"
 COM_CATEGORIES_CATEGORY_OPTIONS="Category"
-COM_CATEGORIES_CHANGE_CATEGORY="Change Category"
+COM_CATEGORIES_CHANGE_CATEGORY="Select or Change Category"
 COM_CATEGORIES_DELETE_NOT_ALLOWED="Delete not allowed for category %s."
 COM_CATEGORIES_DESCRIPTION_DESC="Enter an optional category description in the text area."
 COM_CATEGORIES_EDIT_CATEGORY="Edit Category"

diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
@@ -7522,6 +7522,13 @@ h6 {
 	color: #fff;
 	margin-right: -26px;
 }
+.sidebar-nav .nav-list > li > a:focus,
+.sidebar-nav .nav-list > li > a:hover {
+	text-decoration: none;
+	color: #fff;
+	background-color: #2d6ca2;
+	text-shadow: none;
+}
 .quick-icons .nav li + .nav-header {
 	margin-top: 12px;
 	margin-bottom: 2px;

diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
@@ -7522,6 +7522,13 @@ h6 {
 	color: #fff;
 	margin-right: -26px;
 }
+.sidebar-nav .nav-list > li > a:focus,
+.sidebar-nav .nav-list > li > a:hover {
+	text-decoration: none;
+	color: #fff;
+	background-color: #2d6ca2;
+	text-shadow: none;
+}
 .quick-icons .nav li + .nav-header {
 	margin-top: 12px;
 	margin-bottom: 2px;

diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
@@ -504,6 +504,14 @@ h6 {
 	color: #fff;
 	margin-right: -26px;
 }
+.sidebar-nav .nav-list > li > a:focus,
+.sidebar-nav .nav-list > li > a:hover {
+	text-decoration: none;
+	color: #fff;
+	background-color: #2d6ca2;
+    text-shadow: none;
+}
+
 /* Quick-icons */
 .quick-icons .nav li + .nav-header {
 	margin-top: 12px;

diff --git a/administrator/templates/isis/login.php b/administrator/templates/isis/login.php
@@ -90,7 +90,7 @@ function colorIsLight($color)
 	}");
 
 // Check if debug is on
-if ($app->get('debug_lang', 1) || $app->get('debug', 1))
+if (JPluginHelper::isEnabled('system', 'debug') && ($app->get('debug_lang', 0) || $app->get('debug', 0)))
 {
 	$doc->addStyleDeclaration("
 	.view-login .container {

diff --git a/composer.lock b/composer.lock
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
@@ -35,6 +35,7 @@ abstract class JHtmlBehavior
 	 * @return  void
 	 *
 	 * @since   1.6
+	 * @deprecated 4.0 Update scripts to jquery
 	 */
 	public static function framework($extras = false, $debug = null)
 	{
@@ -46,6 +47,8 @@ public static function framework($extras = false, $debug = null)
 			return;
 		}
 
+		JLog::add('JHtmlBehavior::framework is deprecated. Update to jquery scripts.', JLog::WARNING, 'deprecated');
+
 		// If no debugging value is set, use the configuration setting
 		if ($debug === null)
 		{
@@ -343,6 +346,7 @@ public static function tooltip($selector = '.hasTip', $params = array())
 	 * @return  void
 	 *
 	 * @since   1.5
+	 * @deprecated 4.0  Use the modal equivalent from bootstrap
 	 */
 	public static function modal($selector = 'a.modal', $params = array())
 	{
@@ -366,6 +370,8 @@ public static function modal($selector = 'a.modal', $params = array())
 			return;
 		}
 
+		JLog::add('JHtmlBehavior::modal is deprecated. Use the modal equivalent from bootstrap.', JLog::WARNING, 'deprecated');
+
 		// Setup options object
 		$opt['ajaxOptions']   = (isset($params['ajaxOptions']) && (is_array($params['ajaxOptions']))) ? $params['ajaxOptions'] : null;
 		$opt['handler']       = (isset($params['handler'])) ? $params['handler'] : null;

diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
@@ -181,9 +181,13 @@ public static function renderModule($module, $attribs = array())
 		{
 			$lang = JFactory::getLanguage();
 
-			// 1.5 or Core then 1.6 3PD
-			$lang->load($module->module, JPATH_BASE, null, false, true) ||
-				$lang->load($module->module, dirname($path), null, false, true);
+			// Only load the module's language file if it hasn't been already
+			if (!$lang->getPaths($module->module))
+			{
+				// 1.5 or Core then 1.6 3PD
+				$lang->load($module->module, JPATH_BASE, null, false, true) ||
+					$lang->load($module->module, dirname($path), null, false, true);
+			}
 
 			$content = '';
 			ob_start();