Skip to content

Commit

Permalink
Merge branch '4.1-dev' into j4/adapter/trait
Browse files Browse the repository at this point in the history
  • Loading branch information
laoneo authored Jan 5, 2022
2 parents 6dd299d + 6c2dfa6 commit bfe7daa
Show file tree
Hide file tree
Showing 16 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion administrator/language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.1.0</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="administrator">
<name>English (en-GB)</name>
<version>4.1.0</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion administrator/manifests/files/joomla.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>4.1.0-dev</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB) Language Pack</name>
<packagename>en-GB</packagename>
<version>4.1.0.1</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected function preprocessSaveData(array $data): array
*
* @return integer The record ID on success, false on failure
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
protected function save($recordKey = null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public function displayList()
$filter = InputFilter::getInstance();

// Search for files matching (part of) a name or glob pattern.
if ($doSearch = array_key_exists('search', $apiFilterInfo))
if (\array_key_exists('search', $apiFilterInfo))
{
$this->modelState->set('search', $filter->clean($apiFilterInfo['search'], 'STRING'));

Expand Down
2 changes: 1 addition & 1 deletion api/language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.1.0</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion api/language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="api">
<name>English (en-GB)</name>
<version>4.1.0</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (United Kingdom)</name>
<version>4.1.0</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.1.0</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="site">
<name>English (en-GB)</name>
<version>4.1.0</version>
<creationDate>December 2021</creationDate>
<creationDate>January 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Toolbar/CoreButtonsTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public function preview(string $url, string $text = 'JGLOBAL_PREVIEW', $newWindo
*
* @return PopupButton|LinkButton
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
public function jooa11y(string $url, string $text = 'JGLOBAL_JOOA11Y', $newWindow = false)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Toolbar/ToolbarHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public static function preview($url = '', $updateEditors = false, $icon = 'previ
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
public static function jooa11y($url = '', $updateEditors = false, $icon = 'icon-universal-access', $bodyHeight = null, $modalWidth = null)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ final class Version
* @var string
* @since 3.5
*/
const RELDATE = '21-December-2021';
const RELDATE = '4-January-2022';

/**
* Release time.
Expand Down
12 changes: 6 additions & 6 deletions plugins/system/jooa11y/jooa11y.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
/**
* Jooa11y plugin to add an accessibility checker
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
class PlgSystemJooa11y extends CMSPlugin implements SubscriberInterface
{
/**
* Application object.
*
* @var CMSApplicationInterface
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
protected $app;

/**
* Affects constructor behavior. If true, language files will be loaded automatically.
*
* @var boolean
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
protected $autoloadLanguage = true;

Expand All @@ -43,7 +43,7 @@ class PlgSystemJooa11y extends CMSPlugin implements SubscriberInterface
*
* @return string[] An array of event mappings
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*
* @throws Exception
*/
Expand All @@ -65,7 +65,7 @@ public static function getSubscribedEvents(): array
*
* @return boolean True if access is allowed.
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
private function isAuthorisedDisplayChecker(): bool
{
Expand Down Expand Up @@ -101,7 +101,7 @@ private function isAuthorisedDisplayChecker(): bool
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
public function initJooa11y()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public function navigateUsingBreadcrumb(Media $I)
*
* @throws Exception
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
public function searchInFilesAndFolders(Media $I)
{
Expand All @@ -288,7 +288,7 @@ public function searchInFilesAndFolders(Media $I)
*
* @throws Exception
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
public function searchIsClearedOnNavigate(Media $I)
{
Expand Down

0 comments on commit bfe7daa

Please sign in to comment.