diff --git a/administrator/components/com_joomlaupdate/controllers/update.php b/administrator/components/com_joomlaupdate/controllers/update.php index e62fe4f6ac673..e00e29d5bce27 100644 --- a/administrator/components/com_joomlaupdate/controllers/update.php +++ b/administrator/components/com_joomlaupdate/controllers/update.php @@ -389,7 +389,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 index 52c8dbd337676..d7309732e8eff 100644 --- 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 index 207ab11ed992d..d6927b6e5e62a 100644 --- 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 index de8c73bff7d6d..52e293cd73040 100644 --- 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/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index 3110eec31414b..1435d4bd4e212 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.6.3 - August 2016 + September 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 7f26c90a9d76a..e296760e2ce75 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (United Kingdom) en-GB 3.6.3 - August 2016 + September 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index f09347b6cfe92..17eba2870f6db 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2005 - 2016 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.6.3-dev - August 2016 + 3.6.3-rc1 + September 2016 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 50a97a7eeb427..e0b5b1843e1b0 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -3,7 +3,7 @@ English (en-GB) Language Pack en-GB 3.6.3.1 - August 2016 + September 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_menu/tmpl/default.php b/administrator/modules/mod_menu/tmpl/default.php index 15299b57dcd3c..5bbf3dbb11128 100644 --- 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 index 30e0d0a3dc689..750ff5678012c 100644 --- a/administrator/modules/mod_menu/tmpl/default_disabled.php +++ b/administrator/modules/mod_menu/tmpl/default_disabled.php @@ -9,16 +9,14 @@ 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')); @@ -26,7 +24,7 @@ /** * Menus Submenu -**/ + */ if ($user->authorise('core.manage', 'com_menus')) { $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), null, 'disabled')); @@ -34,7 +32,7 @@ /** * Content Submenu -**/ + */ if ($user->authorise('core.manage', 'com_content')) { $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), null, 'disabled')); @@ -42,7 +40,7 @@ /** * 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 index ffd44957b2ecb..a155de8747e37 100644 --- 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 index 6400796c2686b..ec397003a2522 100644 --- 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 index 174c5b37d5fc8..6c645bba4aea4 100644 --- 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_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php index a1a08487354e6..973ea6abcb9a0 100644 --- a/components/com_tags/views/tag/view.html.php +++ b/components/com_tags/views/tag/view.html.php @@ -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); @@ -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)) { diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index e7fff1f645b1c..8430f2068c11e 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -4,7 +4,7 @@ client="installation"> English (United Kingdom) 3.6.3 - August 2016 + September 2016 Joomla! Project Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/tk-TM/tk-TM.xml b/installation/language/tk-TM/tk-TM.xml index f6827d98f7fd6..6288cde82914d 100644 --- a/installation/language/tk-TM/tk-TM.xml +++ b/installation/language/tk-TM/tk-TM.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Shohrat Permanov - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt tk-TM.ini diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 8e7fb2f65fb5a..00baa3f7ec4cf 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.6.3 - August 2016 + September 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 6e0cb52153058..f83bd9a7dbb13 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (United Kingdom) en-GB 3.6.3 - August 2016 + September 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php index 4574077ff0c68..900c79da28fc8 100644 --- a/libraries/cms/application/cms.php +++ b/libraries/cms/application/cms.php @@ -696,7 +696,7 @@ public function isSite() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ protected function loadLibraryLanguage() { diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php index 3cc6e61858b99..9066a1ffb18d2 100644 --- a/libraries/cms/application/site.php +++ b/libraries/cms/application/site.php @@ -686,7 +686,7 @@ protected function initialiseApp($options = array()) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ protected function loadLibraryLanguage() { diff --git a/libraries/cms/authentication/helper.php b/libraries/cms/authentication/helper.php index 6290130edcf4a..1540880467c68 100644 --- a/libraries/cms/authentication/helper.php +++ b/libraries/cms/authentication/helper.php @@ -14,7 +14,7 @@ /** * Authentication helper class * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ abstract class JAuthenticationHelper { @@ -23,7 +23,7 @@ abstract class JAuthenticationHelper * * @return array Two factor authentication methods. * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public static function getTwoFactorMethods() { diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php index 0274405e9e34a..879577feb49ed 100644 --- a/libraries/cms/component/helper.php +++ b/libraries/cms/component/helper.php @@ -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() { diff --git a/libraries/cms/form/field/moduleorder.php b/libraries/cms/form/field/moduleorder.php index 31a6c54f16fdf..3545f4343ab84 100644 --- a/libraries/cms/form/field/moduleorder.php +++ b/libraries/cms/form/field/moduleorder.php @@ -28,7 +28,7 @@ class JFormFieldModuleOrder extends JFormField * Name of the layout being used to render the field * * @var string - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ protected $layout = 'joomla.form.field.moduleorder'; @@ -39,7 +39,7 @@ class JFormFieldModuleOrder extends JFormField * * @return mixed The property value or null. * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function __get($name) { @@ -60,7 +60,7 @@ public function __get($name) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function __set($name, $value) { @@ -87,7 +87,7 @@ public function __set($name, $value) * @return boolean True on success. * * @see JFormField::setup() - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function setup(SimpleXMLElement $element, $value, $group = null) { @@ -118,7 +118,7 @@ protected function getInput() * * @return array * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ protected function getLayoutData() { diff --git a/libraries/cms/helper/usergroups.php b/libraries/cms/helper/usergroups.php index 2f1b12dc5c328..04de03ddec315 100644 --- a/libraries/cms/helper/usergroups.php +++ b/libraries/cms/helper/usergroups.php @@ -12,19 +12,19 @@ /** * Helper to deal with user groups. * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ final class JHelperUsergroups { /** * @const integer - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ const MODE_SINGLETON = 1; /** * @const integer - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ const MODE_INSTANCE = 2; @@ -32,7 +32,7 @@ final class JHelperUsergroups * Singleton instance. * * @var array - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ private static $instance; @@ -40,7 +40,7 @@ final class JHelperUsergroups * Available user groups * * @var array - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ private $groups = array(); @@ -48,7 +48,7 @@ final class JHelperUsergroups * Mode this class is working: singleton or std instance * * @var integer - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ private $mode; @@ -56,7 +56,7 @@ final class JHelperUsergroups * Total available groups * * @var integer - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ private $total; @@ -66,7 +66,7 @@ final class JHelperUsergroups * @param array $groups Array of groups * @param integer $mode Working mode for this class * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function __construct(array $groups = array(), $mode = self::MODE_INSTANCE) { @@ -83,7 +83,7 @@ public function __construct(array $groups = array(), $mode = self::MODE_INSTANCE * * @return integer * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function count() { @@ -95,7 +95,7 @@ public function count() * * @return self * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public static function getInstance() { @@ -117,7 +117,7 @@ public static function getInstance() * * @return mixed stdClass on success. False otherwise * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function get($id) { @@ -142,7 +142,7 @@ public function get($id) * * @return array * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function getAll() { @@ -161,7 +161,7 @@ public function getAll() * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function has($id) { @@ -173,7 +173,7 @@ public function has($id) * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ private function isSingleton() { @@ -185,7 +185,7 @@ private function isSingleton() * * @return integer * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function total() { @@ -212,7 +212,7 @@ public function total() * * @return mixed * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function load($id) { @@ -240,7 +240,7 @@ public function load($id) * * @return self * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function loadAll() { @@ -268,7 +268,7 @@ public function loadAll() * * @return array * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ private function populateGroupsData() { @@ -287,7 +287,7 @@ private function populateGroupsData() * * @return stdClass * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function populateGroupData($group) { @@ -321,7 +321,7 @@ public function populateGroupData($group) * * @return self * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function setGroups(array $groups) { diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php index d276866c9a8c0..04d985da28d41 100644 --- a/libraries/cms/version/version.php +++ b/libraries/cms/version/version.php @@ -38,7 +38,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_LEVEL = '3-dev'; + const DEV_LEVEL = '3-rc1'; /** * Development status. @@ -46,7 +46,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Release Candidate'; /** * Build number. @@ -70,7 +70,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELDATE = '5-August-2016'; + const RELDATE = '27-September-2016'; /** * Release time. @@ -78,7 +78,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELTIME = '00:32'; + const RELTIME = '21:52'; /** * Release timezone. diff --git a/libraries/joomla/access/exception/notallowed.php b/libraries/joomla/access/exception/notallowed.php index a62e3386a9a70..bc227358887db 100644 --- a/libraries/joomla/access/exception/notallowed.php +++ b/libraries/joomla/access/exception/notallowed.php @@ -12,7 +12,7 @@ /** * Exception class defining an not allowed access * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ class JAccessExceptionNotallowed extends RuntimeException { diff --git a/libraries/joomla/cache/exception/connecting.php b/libraries/joomla/cache/exception/connecting.php index ae71d44b11239..9fe9a81ec199b 100644 --- a/libraries/joomla/cache/exception/connecting.php +++ b/libraries/joomla/cache/exception/connecting.php @@ -12,7 +12,7 @@ /** * Exception class defining an error connecting to the cache storage engine * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ class JCacheExceptionConnecting extends RuntimeException { diff --git a/libraries/joomla/cache/exception/unsupported.php b/libraries/joomla/cache/exception/unsupported.php index 1dba25ad1e620..319265b7f2a7b 100644 --- a/libraries/joomla/cache/exception/unsupported.php +++ b/libraries/joomla/cache/exception/unsupported.php @@ -12,7 +12,7 @@ /** * Exception class defining an unsupported cache storage object * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ class JCacheExceptionUnsupported extends RuntimeException { diff --git a/libraries/joomla/cache/storage.php b/libraries/joomla/cache/storage.php index 1608b0aa150a6..d7cc91c12e78e 100644 --- a/libraries/joomla/cache/storage.php +++ b/libraries/joomla/cache/storage.php @@ -258,7 +258,7 @@ public function clean($group, $mode = null) * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function flush() { diff --git a/libraries/joomla/cache/storage/memcache.php b/libraries/joomla/cache/storage/memcache.php index befd0d580f0b6..929f5a162c880 100644 --- a/libraries/joomla/cache/storage/memcache.php +++ b/libraries/joomla/cache/storage/memcache.php @@ -309,7 +309,7 @@ public function clean($group, $mode = null) * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function flush() { diff --git a/libraries/joomla/cache/storage/memcached.php b/libraries/joomla/cache/storage/memcached.php index 91588daed1cf5..30cb4f0f5701e 100644 --- a/libraries/joomla/cache/storage/memcached.php +++ b/libraries/joomla/cache/storage/memcached.php @@ -326,7 +326,7 @@ public function clean($group, $mode = null) * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public function flush() { diff --git a/libraries/joomla/filesystem/file.php b/libraries/joomla/filesystem/file.php index bc61da6c9f032..eed31d2204d40 100644 --- a/libraries/joomla/filesystem/file.php +++ b/libraries/joomla/filesystem/file.php @@ -27,9 +27,14 @@ class JFile */ public static function getExt($file) { - $dot = strrpos($file, '.') + 1; + $dot = strrpos($file, '.'); - return substr($file, $dot); + if ($dot === false) + { + return ''; + } + + return (string) substr($file, $dot + 1); } /** diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php index e83bde35ab2c5..ee9435ef2d375 100644 --- a/libraries/joomla/language/language.php +++ b/libraries/joomla/language/language.php @@ -865,7 +865,7 @@ protected function parse($filename) * * @return integer A count of the number of parsing errors * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @throws InvalidArgumentException */ public function debugFile($filename) diff --git a/libraries/joomla/session/exception/unsupported.php b/libraries/joomla/session/exception/unsupported.php index c595fad05bea2..b0db33e5ae066 100644 --- a/libraries/joomla/session/exception/unsupported.php +++ b/libraries/joomla/session/exception/unsupported.php @@ -12,7 +12,7 @@ /** * Exception class defining an unsupported session storage object * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ class JSessionExceptionUnsupported extends RuntimeException { diff --git a/libraries/joomla/table/table.php b/libraries/joomla/table/table.php index 26907ecdf4435..b655768edb745 100644 --- a/libraries/joomla/table/table.php +++ b/libraries/joomla/table/table.php @@ -292,7 +292,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = array()) { /* * If unable to find the class file in the JTable include paths. Return false. - * The warning JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND has been removed in __DEPLOY_VERSION__. + * The warning JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND has been removed in 3.6.3. * In 4.0 an Exception (type to be determined) will be thrown. * For more info see https://github.com/joomla/joomla-cms/issues/11570 */ diff --git a/libraries/loader.php b/libraries/loader.php index 735feb74c31e1..46d20e350e7ca 100644 --- a/libraries/loader.php +++ b/libraries/loader.php @@ -68,7 +68,7 @@ abstract class JLoader * Holds a reference for all deprecated aliases (mainly for use by a logging platform). * * @var array - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ protected static $deprecatedAliases = array(); @@ -142,7 +142,7 @@ public static function getClassList() * * @return array An associative array with deprecated class alias data. * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ public static function getDeprecatedAliases() { diff --git a/plugins/system/updatenotification/postinstall/updatecachetime.php b/plugins/system/updatenotification/postinstall/updatecachetime.php index 70f17a3811b97..ea0ad27deadc0 100644 --- a/plugins/system/updatenotification/postinstall/updatecachetime.php +++ b/plugins/system/updatenotification/postinstall/updatecachetime.php @@ -12,7 +12,7 @@ * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ function updatecachetime_postinstall_condition() { @@ -32,7 +32,7 @@ function updatecachetime_postinstall_condition() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ function updatecachetime_postinstall_action() { diff --git a/plugins/system/updatenotification/updatenotification.php b/plugins/system/updatenotification/updatenotification.php index 3be554507c17a..d3daec756a279 100644 --- a/plugins/system/updatenotification/updatenotification.php +++ b/plugins/system/updatenotification/updatenotification.php @@ -29,7 +29,7 @@ class PlgSystemUpdatenotification extends JPlugin * Load plugin language files automatically * * @var boolean - * @since __DEPLOY_VERSION__ + * @since 3.6.3 */ protected $autoloadLanguage = true; diff --git a/tests/javascript/caption/spec-setup.js b/tests/javascript/caption/spec-setup.js index 9440a225639b1..a445c187f26d8 100644 --- a/tests/javascript/caption/spec-setup.js +++ b/tests/javascript/caption/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/caption/spec.js b/tests/javascript/caption/spec.js index 58145cf4c2b50..055d45bc33910 100644 --- a/tests/javascript/caption/spec.js +++ b/tests/javascript/caption/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/combobox/spec-setup.js b/tests/javascript/combobox/spec-setup.js index 9788242defdd4..aa232815b1de9 100644 --- a/tests/javascript/combobox/spec-setup.js +++ b/tests/javascript/combobox/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/combobox/spec.js b/tests/javascript/combobox/spec.js index 2d7f360c38cd2..49bbc25328e2a 100644 --- a/tests/javascript/combobox/spec.js +++ b/tests/javascript/combobox/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/core/spec-setup.js b/tests/javascript/core/spec-setup.js index 7bcd2f93347f9..ae3f8d2eaf34b 100644 --- a/tests/javascript/core/spec-setup.js +++ b/tests/javascript/core/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/core/spec.js b/tests/javascript/core/spec.js index 893731e9727ce..3b2ef362af550 100644 --- a/tests/javascript/core/spec.js +++ b/tests/javascript/core/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/highlighter/spec-setup.js b/tests/javascript/highlighter/spec-setup.js index f668097772fce..04b57e1bb1f09 100644 --- a/tests/javascript/highlighter/spec-setup.js +++ b/tests/javascript/highlighter/spec-setup.js @@ -3,7 +3,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt * @package Joomla * @subpackage JavaScript Tests - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/highlighter/spec.js b/tests/javascript/highlighter/spec.js index 06860ef0b56de..f8f363864ccdb 100644 --- a/tests/javascript/highlighter/spec.js +++ b/tests/javascript/highlighter/spec.js @@ -3,7 +3,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt * @package Joomla * @subpackage JavaScript Tests - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/permissions/spec-setup.js b/tests/javascript/permissions/spec-setup.js index 59437c6218222..88a30e0a6e15b 100644 --- a/tests/javascript/permissions/spec-setup.js +++ b/tests/javascript/permissions/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/permissions/spec.js b/tests/javascript/permissions/spec.js index 29bbe37f3ce53..18e966534afa4 100644 --- a/tests/javascript/permissions/spec.js +++ b/tests/javascript/permissions/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/repeatable/spec-setup.js b/tests/javascript/repeatable/spec-setup.js index dee191b7d3b85..dcc5d4acaf54f 100644 --- a/tests/javascript/repeatable/spec-setup.js +++ b/tests/javascript/repeatable/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/repeatable/spec.js b/tests/javascript/repeatable/spec.js index 90b33c7eb1794..74f1dfaedefd1 100644 --- a/tests/javascript/repeatable/spec.js +++ b/tests/javascript/repeatable/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/sendtestmail/spec-setup.js b/tests/javascript/sendtestmail/spec-setup.js index 5a2155bc67df6..36a3099cbe02e 100644 --- a/tests/javascript/sendtestmail/spec-setup.js +++ b/tests/javascript/sendtestmail/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/sendtestmail/spec.js b/tests/javascript/sendtestmail/spec.js index 8de0d1697cd80..e64bf9aec8897 100644 --- a/tests/javascript/sendtestmail/spec.js +++ b/tests/javascript/sendtestmail/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/subform-repeatable/spec-setup.js b/tests/javascript/subform-repeatable/spec-setup.js index d0da020f42d64..244c0befa7986 100644 --- a/tests/javascript/subform-repeatable/spec-setup.js +++ b/tests/javascript/subform-repeatable/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/subform-repeatable/spec.js b/tests/javascript/subform-repeatable/spec.js index b9b817f623920..31f44a119d892 100644 --- a/tests/javascript/subform-repeatable/spec.js +++ b/tests/javascript/subform-repeatable/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/switcher/spec-setup.js b/tests/javascript/switcher/spec-setup.js index 5773cae84e8e0..a8ed469f947ec 100644 --- a/tests/javascript/switcher/spec-setup.js +++ b/tests/javascript/switcher/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/switcher/spec.js b/tests/javascript/switcher/spec.js index d3c9c71545cdf..dedcf84fd1eca 100644 --- a/tests/javascript/switcher/spec.js +++ b/tests/javascript/switcher/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/validate/spec-setup.js b/tests/javascript/validate/spec-setup.js index a9721fa27bc21..f5433deef76a1 100644 --- a/tests/javascript/validate/spec-setup.js +++ b/tests/javascript/validate/spec-setup.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */ diff --git a/tests/javascript/validate/spec.js b/tests/javascript/validate/spec.js index 6964dda1400b3..b03f9a5f4a4f4 100644 --- a/tests/javascript/validate/spec.js +++ b/tests/javascript/validate/spec.js @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * - * @since __DEPLOY_VERSION__ + * @since 3.6.3 * @version 1.0.0 */