diff --git a/administrator/components/com_contact/Table/ContactTable.php b/administrator/components/com_contact/Table/ContactTable.php index 04f53ce83dc45..56a0c3ad5f726 100644 --- a/administrator/components/com_contact/Table/ContactTable.php +++ b/administrator/components/com_contact/Table/ContactTable.php @@ -31,7 +31,7 @@ class ContactTable extends Table * Indicates that columns fully support the NULL value in the database * * @var boolean - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $_supportNullValue = true; diff --git a/administrator/components/com_finder/Indexer/Adapter.php b/administrator/components/com_finder/Indexer/Adapter.php index c9c2e36024cc2..b1e580c7be72d 100644 --- a/administrator/components/com_finder/Indexer/Adapter.php +++ b/administrator/components/com_finder/Indexer/Adapter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_finder/Indexer/Helper.php b/administrator/components/com_finder/Indexer/Helper.php index dd4110adc776f..b68cc04b0beff 100644 --- a/administrator/components/com_finder/Indexer/Helper.php +++ b/administrator/components/com_finder/Indexer/Helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_finder/Indexer/Indexer.php b/administrator/components/com_finder/Indexer/Indexer.php index 658a4562454c9..a3639eda6ba46 100644 --- a/administrator/components/com_finder/Indexer/Indexer.php +++ b/administrator/components/com_finder/Indexer/Indexer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_finder/Indexer/Parser.php b/administrator/components/com_finder/Indexer/Parser.php index 6c869fdd3d7c0..f830813b12417 100644 --- a/administrator/components/com_finder/Indexer/Parser.php +++ b/administrator/components/com_finder/Indexer/Parser.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_finder/Indexer/Query.php b/administrator/components/com_finder/Indexer/Query.php index 52b7c93d7321f..62017bbc423d5 100644 --- a/administrator/components/com_finder/Indexer/Query.php +++ b/administrator/components/com_finder/Indexer/Query.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -111,7 +111,7 @@ class Query * Allow empty searches * * @var boolean - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public $empty; diff --git a/administrator/components/com_finder/Indexer/Result.php b/administrator/components/com_finder/Indexer/Result.php index 31e1250d3ec9c..638ce0e16e9a3 100644 --- a/administrator/components/com_finder/Indexer/Result.php +++ b/administrator/components/com_finder/Indexer/Result.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -422,7 +422,7 @@ public function addTaxonomy($branch, $title, $state = 1, $access = 1, $language * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function addNestedTaxonomy($branch, ImmutableNodeInterface $contentNode, $state = 1, $access = 1, $language = '') { @@ -462,7 +462,7 @@ public function setLanguage() * * @return string The serialised data * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function serialize() { @@ -519,7 +519,7 @@ public function serialize() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function unserialize($serialized) { diff --git a/administrator/components/com_finder/Indexer/Taxonomy.php b/administrator/components/com_finder/Indexer/Taxonomy.php index 4db1f2209a7c3..c7a782b02cd23 100644 --- a/administrator/components/com_finder/Indexer/Taxonomy.php +++ b/administrator/components/com_finder/Indexer/Taxonomy.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -26,7 +26,7 @@ class Taxonomy * An internal cache of taxonomy data. * * @var object[] - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public static $taxonomies = array(); @@ -34,7 +34,7 @@ class Taxonomy * An internal cache of branch data. * * @var object[] - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public static $branches = array(); @@ -111,7 +111,7 @@ public static function addNode($branch, $title, $state = 1, $access = 1, $langua * * @return integer The id of the node. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public static function addNestedNode($branch, NodeInterface $node, $state = 1, $access = 1, $language = '', $branchId = null) { @@ -150,7 +150,7 @@ public static function addNestedNode($branch, NodeInterface $node, $state = 1, $ * * @return integer The id of the inserted node. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected static function storeNode($node, $parent_id) { @@ -387,7 +387,7 @@ public static function removeOrphanNodes() * * @return object|array A taxonomy object or an array of all taxonomies * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public static function getTaxonomy($id = 0) { @@ -424,7 +424,7 @@ public static function getTaxonomy($id = 0) * * @return object|array The object with the branch data or an array of all branches * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public static function getBranch($title = '') { diff --git a/administrator/components/com_finder/Indexer/Token.php b/administrator/components/com_finder/Indexer/Token.php index f8943bd800ae5..107099ec2d145 100644 --- a/administrator/components/com_finder/Indexer/Token.php +++ b/administrator/components/com_finder/Indexer/Token.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/Table/MenuTable.php b/administrator/components/com_menus/Table/MenuTable.php index c3f8d994cd404..5ded60c5a5080 100644 --- a/administrator/components/com_menus/Table/MenuTable.php +++ b/administrator/components/com_menus/Table/MenuTable.php @@ -55,7 +55,7 @@ public function delete($pk = null, $children = false) * @return boolean True on success, false on failure * * @see JTable::check - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function check() { diff --git a/administrator/components/com_modules/Field/ModulesPositioneditField.php b/administrator/components/com_modules/Field/ModulesPositioneditField.php index 34eb76b4d61dd..38fa1e7cae376 100644 --- a/administrator/components/com_modules/Field/ModulesPositioneditField.php +++ b/administrator/components/com_modules/Field/ModulesPositioneditField.php @@ -42,7 +42,7 @@ class ModulesPositioneditField extends FormField * Client name. * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $client; @@ -53,7 +53,7 @@ class ModulesPositioneditField extends FormField * * @return mixed The property value or null. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function __get($name) { @@ -74,7 +74,7 @@ public function __get($name) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function __set($name, $value) { @@ -101,7 +101,7 @@ public function __set($name, $value) * @return boolean True on success. * * @see FormField::setup() - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function setup(\SimpleXMLElement $element, $value, $group = null) { diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index ddc634f485e57..836b52acd3010 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - April 2019 + May 2019 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 ce2519b6abd59..47eb58599d2a3 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.0.0 - April 2019 + May 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index faa9e02bf976d..20caff134b037 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2005 - 2019 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 4.0.0-alpha9-dev - April 2019 + 4.0.0-alpha10-dev + May 2019 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 f41c651edca2c..35bee1653c985 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 4.0.0.1 - April 2019 + May 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index fbd27481822fe..f7fe59a180941 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) 4.0.0 - April 2019 + May 2019 Joomla! Project Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index adfb34c7ad4e8..9f4ad3393a063 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - April 2019 + May 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 9a7fa0052dea1..0088212108aa7 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.0.0 - April 2019 + May 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/layouts/joomla/toolbar/dropdown.php b/layouts/joomla/toolbar/dropdown.php index f0e69fccc8679..dd8add82713b6 100644 --- a/layouts/joomla/toolbar/dropdown.php +++ b/layouts/joomla/toolbar/dropdown.php @@ -10,11 +10,11 @@ defined('JPATH_BASE') or die; use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; $direction = Factory::getLanguage()->isRtl() ? 'dropdown-menu-right' : ''; - /** * @var string $id * @var string $onclick @@ -32,6 +32,7 @@ extract($displayData, EXTR_OVERWRITE); ?> +