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

…sername
joomla · Sep 30, 2016 · 48196ad · 48196ad
2 parents 296c3ee + 90a091d
commit 48196ad
Show file tree

Hide file tree

Showing 64 changed files with 171 additions and 207 deletions.
diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php
@@ -15,6 +15,14 @@
 JHtml::_('behavior.multiselect');
 JHtml::_('formbehavior.chosen', 'select');
 
+$purchaseTypes = array(
+		'1' => 'UNLIMITED',
+		'2' => 'YEARLY',
+		'3' => 'MONTHLY',
+		'4' => 'WEEKLY',
+		'5' => 'DAILY',
+);
+
 $user       = JFactory::getUser();
 $userId     = $user->get('id');
 $listOrder  = $this->escape($this->state->get('list.ordering'));
@@ -136,9 +144,9 @@
 							</td>
 							<td class="small hidden-phone">
 								<?php if ($item->purchase_type < 0): ?>
-									<?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_' . $params->get('purchase_type'))); ?>
+									<?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_' . $purchaseTypes[$params->get('purchase_type')])); ?>
 								<?php else: ?>
-									<?php echo JText::_('COM_BANNERS_FIELD_VALUE_' . $item->purchase_type); ?>
+									<?php echo JText::_('COM_BANNERS_FIELD_VALUE_' . $purchaseTypes[$item->purchase_type]); ?>
 								<?php endif; ?>
 							</td>
 							<td class="hidden-phone">

diff --git a/administrator/components/com_joomlaupdate/controllers/update.php b/administrator/components/com_joomlaupdate/controllers/update.php
@@ -375,7 +375,7 @@ protected function _applyCredentials()
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.6.3
 	 */
 	public function finaliseconfirm()
 	{

diff --git a/administrator/components/com_languages/models/installed.php b/administrator/components/com_languages/models/installed.php
@@ -229,7 +229,7 @@ public function getData()
 					continue;
 				}
 
-				$row  = new StdClass;
+				$row  = new stdClass;
 
 				$row->language     = $lang->element;
 				$row->client_id    = (int) $lang->client_id;

diff --git a/administrator/components/com_modules/controllers/module.php b/administrator/components/com_modules/controllers/module.php
@@ -229,7 +229,7 @@ public function save($key = null, $urlVar = null)
 	 *
 	 * @return  string  The data for the Ajax request.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.6.3
 	 */
 	public function orderPosition()
 	{

diff --git a/administrator/components/com_users/models/groups.php b/administrator/components/com_users/models/groups.php
@@ -176,7 +176,7 @@ protected function getListQuery()
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.6.3
 	 */
 	private function populateExtraData(array $items)
 	{

diff --git a/administrator/components/com_users/views/level/tmpl/edit.php b/administrator/components/com_users/views/level/tmpl/edit.php
@@ -23,71 +23,6 @@
 		}
 	};
 ");
-/*
-window.addEvent('domready', function(){
-	document.id('user-groups').getElements('input').each(function(i){
-		// Event to check all child groups.
-		i.addEvent('check', function(e){
-			// Check the child groups.
-			document.id('user-groups').getElements('input').each(function(c){
-				if (this.getProperty('rel') == c.id)
-				{
-					c.setProperty('checked', true);
-					c.setProperty('disabled', true);
-					c.fireEvent('check');
-				}
-			}.bind(this));
-		}.bind(i));
-
-		// Event to uncheck all the parent groups.
-		i.addEvent('uncheck', function(e){
-			// Uncheck the parent groups.
-			document.id('user-groups').getElements('input').each(function(c){
-				if (c.getProperty('rel') == this.id)
-				{
-					c.setProperty('checked', false);
-					c.setProperty('disabled', false);
-					c.fireEvent('uncheck');
-				}
-			}.bind(this));
-		}.bind(i));
-
-		// Bind to the click event to check/uncheck child/parent groups.
-		i.addEvent('click', function(e){
-			// Check the child groups.
-			document.id('user-groups').getElements('input').each(function(c){
-				if (this.getProperty('rel') == c.id)
-				{
-					c.setProperty('checked', true);
-					if (this.getProperty('checked'))
-					{
-						c.setProperty('disabled', true);
-					} else {
-						c.setProperty('disabled', false);
-					}
-					c.fireEvent('check');
-				}
-			}.bind(this));
-
-			// Uncheck the parent groups.
-			document.id('user-groups').getElements('input').each(function(c){
-				if (c.getProperty('rel') == this.id)
-				{
-					c.setProperty('checked', false);
-					c.setProperty('disabled', false);
-					c.fireEvent('uncheck');
-				}
-			}.bind(this));
-		}.bind(i));
-
-		// Initialise the widget.
-		if (i.getProperty('checked'))
-		{
-			i.fireEvent('click');
-		}
-	});
-});
-*/
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_users&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="level-form" class="form-validate form-horizontal">

diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
@@ -2,7 +2,7 @@
 <metafile version="3.6" client="administrator">
 	<name>English (en-GB)</name>
 	<version>3.6.3</version>
-	<creationDate>August 2016</creationDate>
+	<creationDate>September 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
 	<version>3.6.3</version>
-	<creationDate>August 2016</creationDate>
+	<creationDate>September 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.6.3-dev</version>
-	<creationDate>August 2016</creationDate>
+	<version>3.6.3-rc1</version>
+	<creationDate>September 2016</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>3.6.3.1</version>
-	<creationDate>August 2016</creationDate>
+	<creationDate>September 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/modules/mod_menu/tmpl/default.php b/administrator/modules/mod_menu/tmpl/default.php
@@ -9,8 +9,8 @@
 
 defined('_JEXEC') or die;
 
-$document = JFactory::getDocument();
-$direction = $document->direction == 'rtl' ? 'pull-right' : '';
+$direction = JFactory::getDocument()->direction == 'rtl' ? 'pull-right' : '';
+
 require JModuleHelper::getLayoutPath('mod_menu', $enabled ? 'default_enabled' : 'default_disabled');
 
 $menu->renderMenu('menu', $enabled ? 'nav ' . $direction : 'nav disabled ' . $direction);
diff --git a/administrator/modules/mod_menu/tmpl/default_disabled.php b/administrator/modules/mod_menu/tmpl/default_disabled.php
@@ -9,40 +9,38 @@
 
 defined('_JEXEC') or die;
 
-$showhelp = $params->get('showhelp', 1);
-
 /**
  * Site SubMenu
-**/
+ */
 $menu->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), null, 'disabled'));
 
 /**
  * Users Submenu
-**/
+ */
 if ($user->authorise('core.manage', 'com_users'))
 {
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS'), null, 'disabled'));
 }
 
 /**
  * Menus Submenu
-**/
+ */
 if ($user->authorise('core.manage', 'com_menus'))
 {
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), null, 'disabled'));
 }
 
 /**
  * Content Submenu
-**/
+ */
 if ($user->authorise('core.manage', 'com_content'))
 {
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), null, 'disabled'));
 }
 
 /**
  * Components Submenu
-**/
+ */
 
 // Get the authorised components and sub-menus.
 $components = ModMenuHelper::getComponents(true);
@@ -55,7 +53,7 @@
 
 /**
  * Extensions Submenu
-**/
+ */
 $im = $user->authorise('core.manage', 'com_installer');
 $mm = $user->authorise('core.manage', 'com_modules');
 $pm = $user->authorise('core.manage', 'com_plugins');
@@ -69,7 +67,8 @@
 
 /**
  * Help Submenu
-**/
-if ($showhelp == 1) {
-$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), null, 'disabled'));
+ */
+if ($params->get('showhelp', 1))
+{
+	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), null, 'disabled'));
 }
diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php
@@ -9,14 +9,16 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\Utilities\ArrayHelper;
+
 /* @var $menu JAdminCSSMenu */
 
-$shownew = (boolean) $params->get('shownew', 1);
-$showhelp = $params->get('showhelp', 1);
-$user = JFactory::getUser();
-$lang = JFactory::getLanguage();
+$shownew  = (boolean) $params->get('shownew', 1);
+$showhelp = (boolean) $params->get('showhelp', 1);
+$user     = JFactory::getUser();
+$lang     = JFactory::getLanguage();
 
-/*
+/**
  * Site Submenu
  */
 $menu->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), '#'), true);
@@ -48,7 +50,7 @@
 
 $menu->getParent();
 
-/*
+/**
  * Users Submenu
  */
 if ($user->authorise('core.manage', 'com_users'))
@@ -119,7 +121,7 @@
 	$menu->getParent();
 }
 
-/*
+/**
  * Menus Submenu
  */
 if ($user->authorise('core.manage', 'com_menus'))
@@ -142,7 +144,7 @@
 
 	// Menu Types
 	$menuTypes = ModMenuHelper::getMenus();
-	$menuTypes = JArrayHelper::sortObjects($menuTypes, 'title', 1, false);
+	$menuTypes = ArrayHelper::sortObjects($menuTypes, 'title', 1, false);
 
 	foreach ($menuTypes as $menuType)
 	{
@@ -205,13 +207,14 @@
 	$menu->getParent();
 }
 
-/*
+/**
  * Content Submenu
  */
 if ($user->authorise('core.manage', 'com_content'))
 {
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), '#'), true);
 	$createContent = $shownew && $user->authorise('core.create', 'com_content');
+
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_ARTICLE_MANAGER'), 'index.php?option=com_content', 'class:article'), $createContent);
 
 	if ($createContent)
@@ -247,7 +250,7 @@
 	$menu->getParent();
 }
 
-/*
+/**
  * Components Submenu
  */
 
@@ -282,7 +285,7 @@
 	$menu->getParent();
 }
 
-/*
+/**
  * Extensions Submenu
  */
 $im = $user->authorise('core.manage', 'com_installer');
@@ -347,7 +350,7 @@
 	$menu->getParent();
 }
 
-/*
+/**
  * Help Submenu
  */
 if ($showhelp == 1)

diff --git a/components/com_config/model/modules.php b/components/com_config/model/modules.php
@@ -177,7 +177,7 @@ public function getPositions()
 	 *
 	 * @return  array  A list of positions
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.6.3
 	 */
 	public static function getActivePositions($clientId, $editPositions = false)
 	{
@@ -228,7 +228,7 @@ public static function getActivePositions($clientId, $editPositions = false)
 	 *
 	 * @return  object  The option as an object (stdClass instance)
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.6.3
 	 */
 	private static function createOption($value = '', $text = '')
 	{
@@ -252,7 +252,7 @@ private static function createOption($value = '', $text = '')
 	 *
 	 * @return  array  Return the new group as an array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.6.3
 	 */
 	private static function createOptionGroup($label = '', $options = array())
 	{

diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php
@@ -53,7 +53,7 @@ class ContactViewContact extends JViewLegacy
 	 * Should we show a captcha form for the submission of the contact request?
 	 *
 	 * @var   bool
-	 * @since __DEPLOY_VERSION__
+	 * @since 3.6.3
 	 */
 	protected $captchaEnabled = false;
 

diff --git a/components/com_newsfeeds/views/category/view.html.php b/components/com_newsfeeds/views/category/view.html.php
@@ -70,9 +70,8 @@ protected function prepareDocument()
 	{
 		parent::prepareDocument();
 
-		$id = (int) @$menu->query['id'];
-
 		$menu = $this->menu;
+		$id = (int) @$menu->query['id'];
 
 		if ($menu && ($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] == 'newsfeed' || $id != $this->category->id))
 		{