From badb6b5812ee6bde4d403bc3250dba3d503cac58 Mon Sep 17 00:00:00 2001 From: Tobias Zulauf Date: Wed, 27 Jan 2021 16:09:04 +0100 Subject: [PATCH 001/153] remove unsued method getCallerFunctionName (#32175) --- libraries/src/Exception/ExceptionHandler.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/libraries/src/Exception/ExceptionHandler.php b/libraries/src/Exception/ExceptionHandler.php index ab96f5e7287ca..8833544aa4864 100644 --- a/libraries/src/Exception/ExceptionHandler.php +++ b/libraries/src/Exception/ExceptionHandler.php @@ -100,7 +100,7 @@ public static function render($error) ob_end_clean(); } - // This is needed to ensure the test suite can still get the output buffer + // This is needed to ensure the test suite can still get the output buffer ob_start(); $document->setTitle(Text::_('ERROR') . ': ' . $error->getCode()); @@ -171,21 +171,6 @@ public static function render($error) jexit(1); } - /** - * Returns name of function, that called current routine or false on failure. Current routine is - * routine, calling {@see getCallerMethod}. - * - * @return string|false - * - * @since 3.10.0 - */ - protected static function getCallerFunctionName() - { - $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - - return isset($backtrace[2]['function']) ? $backtrace[2]['function'] : false; - } - /** * Checks if given error belong to PHP exception class (\Throwable for PHP 7+, \Exception for PHP 5-). * From cd4f219a13b5dcb443c403909600d8f93203455e Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Mon, 1 Feb 2021 16:37:40 +0700 Subject: [PATCH 002/153] Update user.php (#32215) Fix notice in user logout --- components/com_users/controllers/user.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php index 8eccdcce78021..eb952dbc6c36d 100644 --- a/components/com_users/controllers/user.php +++ b/components/com_users/controllers/user.php @@ -232,8 +232,9 @@ public function menulogout() { // Get the ItemID of the page to redirect after logout $app = JFactory::getApplication(); - $itemid = $app->getMenu()->getActive()->params->get('logout'); - + $active = $app->getMenu()->getActive(); + $itemid = $active ? $active->getParams()->get('logout') : 0; + // Get the language of the page when multilang is on if (JLanguageMultilang::isEnabled()) { From 2251ddc1f837518a1dec7c9e2b6ca3bbc819973b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 1 Feb 2021 22:33:50 +0100 Subject: [PATCH 003/153] Dependency - Bump joomla/filter to 1.4.3 (#32206) * Update joomla/filter to 1.4.2 * Update joomla/filter to 1.4.3 --- composer.json | 2 +- composer.lock | 10 ++-- libraries/vendor/composer/installed.json | 14 ++--- .../vendor/joomla/filter/src/InputFilter.php | 54 +++++++++++-------- 4 files changed, 46 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index a404eb4e2995a..96f670b90ff3b 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "joomla/data": "~1.2", "joomla/di": "~1.5", "joomla/event": "~1.2", - "joomla/filter": "^1.4.1", + "joomla/filter": "^1.4.3", "joomla/image": "^1.5", "joomla/input": "~1.3", "joomla/ldap": "~1.2", diff --git a/composer.lock b/composer.lock index 7ab135c406856..452d82bc5ab54 100644 --- a/composer.lock +++ b/composer.lock @@ -534,16 +534,16 @@ }, { "name": "joomla/filter", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/joomla-framework/filter.git", - "reference": "2c9d7293c7b60d222b0c49fc6e0faac4588b2060" + "reference": "df3403c90cd8718895122ed7be27a85d842dcb7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/filter/zipball/2c9d7293c7b60d222b0c49fc6e0faac4588b2060", - "reference": "2c9d7293c7b60d222b0c49fc6e0faac4588b2060", + "url": "https://api.github.com/repos/joomla-framework/filter/zipball/df3403c90cd8718895122ed7be27a85d842dcb7f", + "reference": "df3403c90cd8718895122ed7be27a85d842dcb7f", "shasum": "" }, "require": { @@ -594,7 +594,7 @@ "type": "github" } ], - "time": "2021-01-19T12:41:22+00:00" + "time": "2021-01-31T22:55:23+00:00" }, { "name": "joomla/image", diff --git a/libraries/vendor/composer/installed.json b/libraries/vendor/composer/installed.json index 5375463fc02c1..4779c17680055 100644 --- a/libraries/vendor/composer/installed.json +++ b/libraries/vendor/composer/installed.json @@ -633,17 +633,17 @@ }, { "name": "joomla/filter", - "version": "1.4.1", - "version_normalized": "1.4.1.0", + "version": "1.4.3", + "version_normalized": "1.4.3.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/filter.git", - "reference": "2c9d7293c7b60d222b0c49fc6e0faac4588b2060" + "reference": "df3403c90cd8718895122ed7be27a85d842dcb7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/filter/zipball/2c9d7293c7b60d222b0c49fc6e0faac4588b2060", - "reference": "2c9d7293c7b60d222b0c49fc6e0faac4588b2060", + "url": "https://api.github.com/repos/joomla-framework/filter/zipball/df3403c90cd8718895122ed7be27a85d842dcb7f", + "reference": "df3403c90cd8718895122ed7be27a85d842dcb7f", "shasum": "" }, "require": { @@ -658,7 +658,7 @@ "suggest": { "joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`." }, - "time": "2021-01-19T12:41:22+00:00", + "time": "2021-01-31T22:55:23+00:00", "type": "joomla-package", "extra": { "branch-alias": { @@ -684,7 +684,7 @@ ], "support": { "issues": "https://github.com/joomla-framework/filter/issues", - "source": "https://github.com/joomla-framework/filter/tree/2.0.0-beta3" + "source": "https://github.com/joomla-framework/filter/tree/2.0.0-beta4" }, "funding": [ { diff --git a/libraries/vendor/joomla/filter/src/InputFilter.php b/libraries/vendor/joomla/filter/src/InputFilter.php index 6623872c7a294..509c02401a2d8 100644 --- a/libraries/vendor/joomla/filter/src/InputFilter.php +++ b/libraries/vendor/joomla/filter/src/InputFilter.php @@ -229,25 +229,27 @@ public function __construct($tagsArray = array(), $attrArray = array(), $tagsMet /** * Cleans the given input source based on the instance configuration and specified data type * - * @param string|string[] $source Input string/array-of-string to be 'cleaned' - * @param string $type The return type for the variable: - * INT: An integer - * UINT: An unsigned integer - * FLOAT: A floating point number - * BOOLEAN: A boolean value - * WORD: A string containing A-Z or underscores only (not case sensitive) - * ALNUM: A string containing A-Z or 0-9 only (not case sensitive) - * CMD: A string containing A-Z, 0-9, underscores, periods or hyphens (not case sensitive) - * BASE64: A string containing A-Z, 0-9, forward slashes, plus or equals (not case sensitive) - * STRING: A fully decoded and sanitised string (default) - * HTML: A sanitised string - * ARRAY: An array - * PATH: A sanitised file path - * TRIM: A string trimmed from normal, non-breaking and multibyte spaces - * USERNAME: Do not use (use an application specific filter) - * RAW: The raw string is returned with no filtering - * unknown: An unknown filter will act like STRING. If the input is an array it will return an - * array of fully decoded and sanitised strings. + * @param string|string[]|object $source Input string/array-of-string/object to be 'cleaned' + * @param string $type The return type for the variable: + * INT: An integer + * UINT: An unsigned integer + * FLOAT: A floating point number + * BOOLEAN: A boolean value + * WORD: A string containing A-Z or underscores only (not case sensitive) + * ALNUM: A string containing A-Z or 0-9 only (not case sensitive) + * CMD: A string containing A-Z, 0-9, underscores, periods or hyphens (not case + * sensitive) + * BASE64: A string containing A-Z, 0-9, forward slashes, plus or equals (not case + * sensitive) + * STRING: A fully decoded and sanitised string (default) + * HTML: A sanitised string + * ARRAY: An array + * PATH: A sanitised file path + * TRIM: A string trimmed from normal, non-breaking and multibyte spaces + * USERNAME: Do not use (use an application specific filter) + * RAW: The raw string is returned with no filtering + * unknown: An unknown filter will act like STRING. If the input is an array it will + * return an array of fully decoded and sanitised strings. * * @return mixed 'Cleaned' version of the `$source` parameter * @@ -279,6 +281,16 @@ public function clean($source, $type = 'string') return $result; } + if (\is_object($source)) + { + foreach (get_object_vars($source) as $key => $value) + { + $source->$key = $this->clean($value, $type); + } + + return $source; + } + $method = 'clean' . $type; if (method_exists($this, $method)) @@ -1011,11 +1023,11 @@ private function cleanPath($source) return preg_replace('~/+~', '/', $source); } - $windowsPattern = '/^([A-Za-z]:\\\\)?[A-Za-z0-9_\/-]+[A-Za-z0-9_\.-]*(\\\\+[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/'; + $windowsPattern = '/^([A-Za-z]:(\\\\|\/))?[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*((\\\\|\/)+[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/'; if (preg_match($windowsPattern, $source)) { - return preg_replace('~\\\\+~', '\\', $source); + return preg_replace('~(\\\\|\/)+~', '\\', $source); } return ''; From 2dddb9892efeed16eff3274cedf871e5add12867 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Tue, 2 Feb 2021 15:22:59 +0700 Subject: [PATCH 004/153] Fix categories list on batch process categories (#32235) --- .../com_categories/views/categories/tmpl/default_batch_body.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php index a4972a5b9f0f0..325b35a6082ad 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php +++ b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php @@ -39,7 +39,7 @@
From 32006674e8af1feda8b10025e0db8826c7ace86d Mon Sep 17 00:00:00 2001 From: zero-24 Date: Tue, 2 Feb 2021 20:08:47 +0100 Subject: [PATCH 005/153] Joomla 3.10.0-alpha5 --- administrator/components/com_admin/script.php | 5 ++++- administrator/language/en-GB/en-GB.xml | 2 +- administrator/language/en-GB/install.xml | 2 +- administrator/manifests/files/joomla.xml | 4 ++-- administrator/manifests/packages/pkg_en-GB.xml | 2 +- installation/language/en-GB/en-GB.xml | 2 +- language/en-GB/en-GB.xml | 2 +- language/en-GB/install.xml | 2 +- libraries/src/Version.php | 10 +++++----- 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 55b5382d4e380..6454bcc8ba835 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2294,6 +2294,9 @@ public function deleteUnexistingFiles() '/libraries/joomla/filesystem/support', '/libraries/joomla/filesystem/wrapper', '/libraries/joomla/filesystem', + // Joomla 3.10.0 + '/libraries/joomla/base/adapter.php', + '/libraries/joomla/base/adapterinstance.php', ); jimport('joomla.filesystem.file'); @@ -2666,7 +2669,7 @@ private function cleanJoomlaCache() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.10.0 */ protected function fixFilenameCasing() { diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index d85c011c4a0c6..ae96156ff6058 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.10.0 - January 2021 + February 2021 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 4941db6ab5392..ed02f11022e68 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 3.10.0 - January 2021 + February 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 3689f4bc3b537..809ec185934dd 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 3.10.0-alpha5-dev - January 2021 + 3.10.0-alpha5 + February 2021 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 ae85d208262c9..1a7ba51088122 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.10.0.1 - January 2021 + February 2021 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 18e44940571cc..6094840f649f2 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.10.0 - January 2021 + February 2021 Joomla! Project (C) 2005 Open Source Matters, Inc. 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 b6de891785817..6e54ebf8e511a 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.10.0 - January 2021 + February 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 7015a08fc7561..644928f7076f0 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 3.10.0 - January 2021 + February 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 9f5e9cc3cc233..d39e685a011e4 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -60,7 +60,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'alpha5-dev'; + const EXTRA_VERSION = 'alpha5'; /** * Release version. @@ -78,7 +78,7 @@ final class Version * @since 3.5 * @deprecated 4.0 Use separated version constants instead */ - const DEV_LEVEL = '0-alpha5-dev'; + const DEV_LEVEL = '0-alpha5'; /** * Development status. @@ -86,7 +86,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Alpha'; /** * Build number. @@ -111,7 +111,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '7-January-2021'; + const RELDATE = '2-February-2021'; /** * Release time. @@ -119,7 +119,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '18:35'; + const RELTIME = '19:01'; /** * Release timezone. From 8a94620a67c0e7da9da99c2245853de01a31557d Mon Sep 17 00:00:00 2001 From: zero-24 Date: Tue, 2 Feb 2021 20:20:51 +0100 Subject: [PATCH 006/153] reset to dev --- administrator/manifests/files/joomla.xml | 2 +- libraries/src/Version.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 809ec185934dd..95275609323c0 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 3.10.0-alpha5 + 3.10.0-alpha6-dev February 2021 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/src/Version.php b/libraries/src/Version.php index d39e685a011e4..ef09ebdbfbbf7 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -60,7 +60,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'alpha5'; + const EXTRA_VERSION = 'alpha6-dev'; /** * Release version. @@ -78,7 +78,7 @@ final class Version * @since 3.5 * @deprecated 4.0 Use separated version constants instead */ - const DEV_LEVEL = '0-alpha5'; + const DEV_LEVEL = '0-alpha6-dev'; /** * Development status. @@ -86,7 +86,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Alpha'; + const DEV_STATUS = 'Development'; /** * Build number. @@ -119,7 +119,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '19:01'; + const RELTIME = '19:19'; /** * Release timezone. From c2570c22a698ed47dd8342b4b87a8df3cc6b9d36 Mon Sep 17 00:00:00 2001 From: Tobias Zulauf Date: Wed, 3 Feb 2021 12:18:47 +0100 Subject: [PATCH 007/153] Add path filter to joomla updates download process for the temp folder (#32076) --- .../com_joomlaupdate/models/default.php | 4 +++- libraries/src/Filter/InputFilter.php | 19 +------------------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php index 8f8ec4037fe71..7e3035db9961a 100644 --- a/administrator/components/com_joomlaupdate/models/default.php +++ b/administrator/components/com_joomlaupdate/models/default.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\CMS\Filter\InputFilter; + jimport('joomla.filesystem.folder'); jimport('joomla.filesystem.file'); @@ -301,7 +303,7 @@ public function download() // Find the path to the temp directory and the local package. $config = JFactory::getConfig(); - $tempdir = $config->get('tmp_path'); + $tempdir = (string) InputFilter::getInstance(array(), array(), 1, 1)->clean($config->get('tmp_path'), 'path'); $target = $tempdir . '/' . $basename; $response = array(); diff --git a/libraries/src/Filter/InputFilter.php b/libraries/src/Filter/InputFilter.php index 0b6bf395e20a8..517160feec425 100644 --- a/libraries/src/Filter/InputFilter.php +++ b/libraries/src/Filter/InputFilter.php @@ -351,24 +351,7 @@ public function clean($source, $type = 'string') break; case 'PATH': - $pattern = '/^[A-Za-z0-9_\/-]+[A-Za-z0-9_\.-]*([\\\\\/][A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/'; - - if (is_array($source)) - { - $result = array(); - - // Iterate through the array - foreach ($source as $eachString) - { - preg_match($pattern, (string) $eachString, $matches); - $result[] = isset($matches[0]) ? (string) $matches[0] : ''; - } - } - else - { - preg_match($pattern, $source, $matches); - $result = isset($matches[0]) ? (string) $matches[0] : ''; - } + $result = parent::clean($source, 'path'); break; case 'TRIM': From e6cbda0560b34f56ecef9213082a9563c1daf540 Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Mon, 8 Feb 2021 11:36:03 +0100 Subject: [PATCH 008/153] [3.x] Added some missing deprecations (#30938) * Added missind deprecation * and will be removed in 4.0 --- libraries/src/Application/CMSApplication.php | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index fb2f1fd8339fd..497432da57f58 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -302,6 +302,19 @@ protected function checkUserRequireReset($option, $view, $layout, $tasks) */ public function getCfg($varname, $default = null) { + try + { + \JLog::add( + sprintf('%s() is deprecated and will be removed in 4.0. Use JFactory->getApplication()->get() instead.', __METHOD__), + \JLog::WARNING, + 'deprecated' + ); + } + catch (RuntimeException $exception) + { + // Informational log only + } + return $this->get($varname, $default); } @@ -636,6 +649,19 @@ protected function initialiseApp($options = array()) */ public function isAdmin() { + try + { + \JLog::add( + sprintf("%s() is deprecated and will be removed in 4.0. Use JFactory->getApplication()->isClient('administrator') instead.", __METHOD__), + \JLog::WARNING, + 'deprecated' + ); + } + catch (RuntimeException $exception) + { + // Informational log only + } + return $this->isClient('administrator'); } @@ -649,6 +675,19 @@ public function isAdmin() */ public function isSite() { + try + { + \JLog::add( + sprintf("%s() is deprecated and will be removed in 4.0. Use JFactory->getApplication()->isClient('site') instead.", __METHOD__), + \JLog::WARNING, + 'deprecated' + ); + } + catch (RuntimeException $exception) + { + // Informational log only + } + return $this->isClient('site'); } From 4a6f30eb2a419976a2a3aaa6c73a89f56e1f0343 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Thu, 11 Feb 2021 15:21:09 +0700 Subject: [PATCH 009/153] Fix batch menu items (#32380) --- .../com_menus/views/items/tmpl/default_batch_body.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php index 1d3a0df45c53d..433cb6e2a4870 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php @@ -63,7 +63,7 @@ $published, + 'published' => $this->state->get('filter.published'), 'checkacl' => (int) $this->state->get('menutypeid'), 'clientid' => (int) $clientId, ); From 485884f093d088582cfdb7ba4381cfee10b31245 Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Sun, 28 Feb 2021 16:02:07 +0100 Subject: [PATCH 010/153] [4.0] Remove itemprop="url" from readmore (#32501) * Remove itemprop="url" from readmore * remove space --- layouts/joomla/content/readmore.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php index 9834ca1e4d252..7b4f89e0f1716 100644 --- a/layouts/joomla/content/readmore.php +++ b/layouts/joomla/content/readmore.php @@ -20,12 +20,12 @@

get('access-view')) : ?> - '; ?> alternative_readmore) : ?> - '; ?> get('show_readmore_title', 0) != 0) : ?> @@ -33,12 +33,12 @@ get('show_readmore_title', 0) == 0) : ?> - '; ?> - '; ?> title, $params->get('readmore_limit'))); ?> From 0553bdb85a6880879c066d532a2b33f8e0119082 Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Sun, 28 Feb 2021 20:19:54 +0100 Subject: [PATCH 011/153] Frontend editing is not inline editing (#32552) The label inline editing is wrong. Inline editing is not having buttons to open an edit form. --- administrator/language/en-GB/com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini index 81bf14c4af751..cf03c677dcaca 100644 --- a/administrator/language/en-GB/com_config.ini +++ b/administrator/language/en-GB/com_config.ini @@ -187,7 +187,7 @@ COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_METHODS_DESC="Specifies the Web service COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_ORIGIN_DESC="Specifies the origin allowed to access Web services on this site, sent back in response to a preflight request. Default: * (=all)." COM_CONFIG_FIELDSET_TAGS_LABEL="Tags" COM_CONFIG_FILTER_OPTION_SELECT_EXTENSION="- Select Extension -" -COM_CONFIG_FRONTEDITING_LABEL="Inline Editing" +COM_CONFIG_FRONTEDITING_LABEL="Frontend Editing" COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus" COM_CONFIG_FRONTEDITING_MODULES="Modules" COM_CONFIG_FTP_DETAILS="FTP Login Details" From 90ab8c02dbb9a0763e9b8bb91bfea690cbc1dd44 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 1 Mar 2021 00:54:37 +0000 Subject: [PATCH 012/153] [4.0] Save button margin (#32551) --- administrator/templates/atum/scss/blocks/_toolbar.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/blocks/_toolbar.scss b/administrator/templates/atum/scss/blocks/_toolbar.scss index abbcee7149f79..08e40514d1e9a 100644 --- a/administrator/templates/atum/scss/blocks/_toolbar.scss +++ b/administrator/templates/atum/scss/blocks/_toolbar.scss @@ -134,7 +134,8 @@ } } - .dropdown-menu joomla-toolbar-button { + .dropdown-menu joomla-toolbar-button, + .btn-group joomla-toolbar-button { margin-inline-start: 0; } } From 705ce67c714bbcd364a3fcb7e13863fb4e5e4147 Mon Sep 17 00:00:00 2001 From: Constantin Romankiewicz Date: Mon, 1 Mar 2021 19:00:24 +0100 Subject: [PATCH 013/153] Fixed empty blog class on update. (#32547) --- administrator/components/com_admin/script.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index f295caa2a7429..39956ddc54612 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -7084,6 +7084,11 @@ private function convertBlogLayouts() // Convert to the according CSS class depending on order = "down" or "across". $layout = ($order === 0) ? 'masonry-' : 'columns-'; + if (!isset($params['blog_class'])) + { + $params['blog_class'] = ''; + } + if (strpos($params['blog_class'], $layout) === false) { $params['blog_class'] .= ' ' . $layout . $nColumns; @@ -7105,7 +7110,7 @@ private function convertBlogLayouts() // Update global parameters for com_content. $nColumns = $contentParams->get('num_columns'); - if ($nColumns !== null || true) + if ($nColumns !== null) { $nColumns = (int) $nColumns; $order = (int) $contentParams->get('multi_column_order', '0'); From 5185266c50004b5fb550bec276250c44e886ce15 Mon Sep 17 00:00:00 2001 From: infograf768 Date: Wed, 3 Mar 2021 17:15:39 +0100 Subject: [PATCH 014/153] [4.0] Delete unused lang strings + update api joomla.ini (#32546) --- administrator/language/en-GB/joomla.ini | 2 -- api/language/en-GB/joomla.ini | 32 ++++++++++++++++++++++--- language/en-GB/joomla.ini | 2 -- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index f7cddb5954177..5c57aa3dc1d0e 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -278,8 +278,6 @@ JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols (suc JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols (such as !@#$). At least 1 symbol is required." JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough upper case characters. At least %s upper case characters are required." JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough upper case characters. At least 1 upper case character is required." -JFIELD_PASSWORD_NOTE_DESC="%1 symbol(s), %2 uppercase letter(s), %3 lowercase letter(s), %4 number(s)" -JFIELD_PASSWORD_NOTE_LBL="Password must contain:" JFIELD_PASSWORD_RULES_CHARACTERS="Characters: %d" JFIELD_PASSWORD_RULES_DIGITS="Numbers: %d" JFIELD_PASSWORD_RULES_LOWERCASE="Lower Case: %d" diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini index d125aaee78049..9a313cae75839 100644 --- a/api/language/en-GB/joomla.ini +++ b/api/language/en-GB/joomla.ini @@ -67,6 +67,7 @@ JCATEGORY_DESC="Category descending" JCATEGORY_SPRINTF="Category: %s" JCLEAR="Clear" JCLIENT="Location" +JCLOSE="Close" JCONFIG_PERMISSIONS_DESC="Permissions for this component unless they are changed for a specific item." JCONFIG_PERMISSIONS_LABEL="Permissions" JCURRENT="Current" @@ -101,8 +102,10 @@ JNEXT_TITLE="Next article: %s" JNO="No" JNONE="None" JOFF="Off" +JOK="OK" JON="On" JONLY="Only" +JOPEN="Open" JOPTIONS="Options" JORDERINGDISABLED="Please sort by order to enable reordering" JPREV="Prev" @@ -234,6 +237,14 @@ JFIELD_LOGOUT_REDIRECT_PAGE_DESC="Select or create the page the user will be red JFIELD_LOGOUT_REDIRECT_PAGE_LABEL="Logout Redirection Page" JFIELD_LOGOUT_REDIRECT_URL_DESC="If a URL is entered here, users will be redirected to it after logout.
The URL must be internal (eg: index.php?Itemid=999)." JFIELD_LOGOUT_REDIRECT_URL_LABEL="Logout Redirect" +JFIELD_MEDIA_ALT_CHECK_DESC_LABEL="Decorative Image - no description required" +JFIELD_MEDIA_ALT_CHECK_LABEL="No Description" +JFIELD_MEDIA_ALT_LABEL="Image Description (Alt Text)" +JFIELD_MEDIA_CLASS_LABEL="Image Class" +JFIELD_MEDIA_FIGURE_CAPTION_LABEL="Figure Caption" +JFIELD_MEDIA_FIGURE_CLASS_LABEL="Figure Class" +JFIELD_MEDIA_LAZY_LABEL="Image will be lazyloaded" +JFIELD_MEDIA_SUMMARY_LABEL="Additional Data" ; Do not translate the text between the {} JFIELD_META_DESCRIPTION_COUNTER="{remaining} characters remaining of {maxlength} characters." JFIELD_META_DESCRIPTION_DESC="An optional paragraph to be used as the description of the page in the HTML output. This will generally display in the results of search engines." @@ -258,9 +269,24 @@ JFIELD_ORDERING_DESC="Select the ordering." JFIELD_ORDERING_LABEL="Ordering" JFIELD_PARAMS_LABEL="Options" JFIELD_PASSWORD_INDICATE_COMPLETE="Password accepted" -JFIELD_PASSWORD_INDICATE_INCOMPLETE="Password doesn't meet site's requirements" -JFIELD_PASSWORD_NOTE_DESC="%1$s symbol(s), %2$s uppercase letter(s), %3$s lowercase letter(s), %4$s number(s) and be %5$s characters long" -JFIELD_PASSWORD_NOTE_LBL="Password must contain:" +JFIELD_PASSWORD_INDICATE_INCOMPLETE="Password doesn't meet site's requirements." +JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N="Password does not have enough numbers. At least %s numbers are required." +JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough numbers. At least 1 number is required." +JFIELD_PASSWORD_NOT_ENOUGH_LOWERCASE_LETTERS_N="Password does not have enough lower case characters. At least %s lower case characters are required." +JFIELD_PASSWORD_NOT_ENOUGH_LOWERCASE_LETTERS_N_1="Password does not have enough lower case characters. At least 1 lower case character is required." +JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols (such as !@#$). At least %s symbols are required." +JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols (such as !@#$). At least 1 symbol is required." +JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough upper case characters. At least %s upper case characters are required." +JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough upper case characters. At least 1 upper case character is required." +JFIELD_PASSWORD_RULES_CHARACTERS="Characters: %d" +JFIELD_PASSWORD_RULES_DIGITS="Numbers: %d" +JFIELD_PASSWORD_RULES_LOWERCASE="Lower Case: %d" +JFIELD_PASSWORD_RULES_MINIMUM_REQUIREMENTS="Minimum Requirements — %s" +JFIELD_PASSWORD_RULES_SYMBOLS="Symbols: %d" +JFIELD_PASSWORD_RULES_UPPERCASE="Upper Case: %d" +JFIELD_PASSWORD_SPACES_IN_PASSWORD="Password must not have spaces at the beginning or end." +JFIELD_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters." +JFIELD_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters." JFIELD_PLG_SEARCH_ALL_DESC="Include published items in the search." JFIELD_PLG_SEARCH_ALL_LABEL="Search Published" JFIELD_PLG_SEARCH_ARCHIVED_DESC="Include archived items in the search." diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini index f288ec524d9c6..b94aff410d5d2 100644 --- a/language/en-GB/joomla.ini +++ b/language/en-GB/joomla.ini @@ -210,8 +210,6 @@ JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols (suc JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols (such as !@#$). At least 1 symbol is required." JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough upper case characters. At least %s upper case characters are required." JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough upper case characters. At least 1 upper case character is required." -JFIELD_PASSWORD_NOTE_DESC="%1 symbol(s), %2 uppercase letter(s), %3 lowercase letter(s), %4 number(s)" -JFIELD_PASSWORD_NOTE_LBL="Password must contain:" JFIELD_PASSWORD_RULES_CHARACTERS="Characters: %d" JFIELD_PASSWORD_RULES_DIGITS="Numbers: %d" JFIELD_PASSWORD_RULES_LOWERCASE="Lower Case: %d" From 538f7fab636718904316702be4d58fd4bf89be96 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Thu, 4 Mar 2021 16:00:28 +0100 Subject: [PATCH 015/153] Fix errors from PR #32043 (#32582) --- administrator/components/com_admin/script.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 39956ddc54612..29205a8f92c79 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -5045,6 +5045,9 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/templates/cassiopeia/html/layouts/chromes/cardGrey.php', '/templates/cassiopeia/html/layouts/chromes/default.php', '/templates/cassiopeia/scss/vendor/bootstrap/_card.scss', + // Joomla 4.0 Beta 7 + '/media/vendor/skipto/js/dropMenu.js', + '/media/vendor/skipto/css/SkipTo.css' ); $folders = array( @@ -6233,10 +6236,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/joomla/controller', // Joomla 4.0 Beta 5 '/plugins/content/imagelazyload', - // Joomla 4.0 Beta 6 - '/media/vendor/skipto/js/skipTo.js', - '/media/vendor/skipto/js/dropMenu.js', - '/media/vendor/skipto/css/SkipTo.css' + // Joomla 4.0 Beta 7 + '/media/vendor/skipto/css' ); $status['files_checked'] = $files; From f2b2452ac062a570291da7c9840ea523c12971f5 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 4 Mar 2021 18:47:16 +0000 Subject: [PATCH 016/153] [4.0] Fields modal (#32585) Fixes a simple copy paste error with the id of the modal --- administrator/components/com_fields/tmpl/fields/modal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php index 477ca7b8619cb..013b37ab82004 100644 --- a/administrator/components/com_fields/tmpl/fields/modal.php +++ b/administrator/components/com_fields/tmpl/fields/modal.php @@ -39,7 +39,7 @@ - +