Skip to content

Commit

Permalink
Merge branch 'staging' into improveReinstall
Browse files Browse the repository at this point in the history
  • Loading branch information
@zero-24
zero-24 committed Sep 29, 2016
2 parents 0ced9bd + 404f2b9 commit dcd41d4
Show file tree
Hide file tree
Showing 58 changed files with 125 additions and 118 deletions.
2 changes: 1 addition & 1 deletion administrator/components/com_joomlaupdate/controllers/update.php
View file
Expand Up @@ -389,7 +389,7 @@ protected function _applyCredentials()
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 3.6.3
*/
public function finaliseconfirm()
{
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_languages/models/installed.php
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/controllers/module.php
View file
Expand Up @@ -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()
{
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_users/models/groups.php
View file
Expand Up @@ -176,7 +176,7 @@ protected function getListQuery()
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 3.6.3
*/
private function populateExtraData(array $items)
{
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/install.xml
View file
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/files/joomla.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion administrator/manifests/packages/pkg_en-GB.xml
View file
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions administrator/modules/mod_menu/tmpl/default.php
View file
Expand Up @@ -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);
21 changes: 10 additions & 11 deletions administrator/modules/mod_menu/tmpl/default_disabled.php
View file
Expand Up @@ -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);
Expand All @@ -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');
Expand All @@ -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'));
}
27 changes: 15 additions & 12 deletions administrator/modules/mod_menu/tmpl/default_enabled.php
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -48,7 +50,7 @@

$menu->getParent();

/*
/**
* Users Submenu
*/
if ($user->authorise('core.manage', 'com_users'))
Expand Down Expand Up @@ -119,7 +121,7 @@
$menu->getParent();
}

/*
/**
* Menus Submenu
*/
if ($user->authorise('core.manage', 'com_menus'))
Expand All @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -247,7 +250,7 @@
$menu->getParent();
}

/*
/**
* Components Submenu
*/

Expand Down Expand Up @@ -282,7 +285,7 @@
$menu->getParent();
}

/*
/**
* Extensions Submenu
*/
$im = $user->authorise('core.manage', 'com_installer');
Expand Down Expand Up @@ -347,7 +350,7 @@
$menu->getParent();
}

/*
/**
* Help Submenu
*/
if ($showhelp == 1)
Expand Down
6 changes: 3 additions & 3 deletions components/com_config/model/modules.php
View file
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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 = '')
{
Expand All @@ -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())
{
Expand Down
2 changes: 1 addition & 1 deletion components/com_contact/views/contact/view.html.php
View file
Expand Up @@ -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;

Expand Down
12 changes: 6 additions & 6 deletions components/com_tags/views/tag/view.html.php
View file
Expand Up @@ -206,7 +206,12 @@ protected function _prepareDocument()
// we need to get it from the menu item itself
$menu = $menus->getActive();

if ($menu)
if ($this->tags_title)
{
$this->params->def('page_heading', $this->tags_title);
$title = $this->tags_title;
}
elseif ($menu)
{
$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
$title = $this->params->get('page_title', $menu->title);
Expand All @@ -216,11 +221,6 @@ protected function _prepareDocument()
$this->params->set('page_subheading', $menu->title);
}
}
else
{
$this->params->def('page_heading', $this->tags_title);
$title = $this->tags_title;
}

if (empty($title))
{
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-GB/en-GB.xml
View file
Expand Up @@ -4,7 +4,7 @@
client="installation">
<name>English (United Kingdom)</name>
<version>3.6.3</version>
<creationDate>August 2016</creationDate>
<creationDate>September 2016</creationDate>
<author>Joomla! Project</author>
<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/tk-TM/tk-TM.xml
View file
Expand Up @@ -6,7 +6,7 @@
<version>3.6.3</version>
<creationDate>August 2016</creationDate>
<author>Shohrat Permanov</author>
<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<files>
<filename>tk-TM.ini</filename>
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/en-GB.xml
View file
Expand Up @@ -2,7 +2,7 @@
<metafile version="3.6" client="site">
<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>
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/install.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/application/cms.php
View file
Expand Up @@ -696,7 +696,7 @@ public function isSite()
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 3.6.3
*/
protected function loadLibraryLanguage()
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/application/site.php
View file
Expand Up @@ -686,7 +686,7 @@ protected function initialiseApp($options = array())
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 3.6.3
*/
protected function loadLibraryLanguage()
{
Expand Down
4 changes: 2 additions & 2 deletions libraries/cms/authentication/helper.php
View file
Expand Up @@ -14,7 +14,7 @@
/**
* Authentication helper class
*
* @since __DEPLOY_VERSION__
* @since 3.6.3
*/
abstract class JAuthenticationHelper
{
Expand All @@ -23,7 +23,7 @@ abstract class JAuthenticationHelper
*
* @return array Two factor authentication methods.
*
* @since __DEPLOY_VERSION__
* @since 3.6.3
*/
public static function getTwoFactorMethods()
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/component/helper.php
View file
Expand Up @@ -514,7 +514,7 @@ protected static function load($option)
*
* @return array The components property
*
* @since __DEPLOY_VERSION__
* @since 3.6.3
*/
public static function getComponents()
{
Expand Down

0 comments on commit dcd41d4

Please sign in to comment.