From 9126cfb44f2ea9e296bba77dbc330cec1349cabd Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Tue, 5 Nov 2019 15:59:16 +0100 Subject: [PATCH 01/42] Reset to dev --- administrator/language/en-GB/en-GB.xml | 2 +- administrator/language/en-GB/install.xml | 2 +- administrator/manifests/files/joomla.xml | 2 +- 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 +++++----- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index 2399350277c9..76f1bec1c87f 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -1,7 +1,7 @@ English (en-GB) - 3.9.13 + 3.9.14 November 2019 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 6fe8830b0cb7..e4ee589d2a64 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 3.9.13 + 3.9.14 November 2019 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 97209b4cefa1..5ffe569629d2 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2005 - 2019 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.9.13 + 3.9.14-dev November 2019 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 045f598487e6..248415042b5b 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 3.9.13.1 + 3.9.14.1 November 2019 Joomla! Project admin@joomla.org diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index eda80b0a84df..5427a9dd6808 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -3,7 +3,7 @@ version="3.8" client="installation"> English (United Kingdom) - 3.9.13 + 3.9.14 November 2019 Joomla! Project Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved. diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index b8dcae55517d..fea3a05c9dc5 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,7 +1,7 @@ English (en-GB) - 3.9.13 + 3.9.14 November 2019 Joomla! Project admin@joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 210de0d0afcf..087ba3edcef0 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 3.9.13 + 3.9.14 November 2019 Joomla! Project admin@joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index ad98a14d6a54..6c1175aaee90 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -49,7 +49,7 @@ final class Version * @var integer * @since 3.8.0 */ - const PATCH_VERSION = 13; + const PATCH_VERSION = 14; /** * Extra release version info. @@ -60,7 +60,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = ''; + const EXTRA_VERSION = 'dev'; /** * Release version. @@ -78,7 +78,7 @@ final class Version * @since 3.5 * @deprecated 4.0 Use separated version constants instead */ - const DEV_LEVEL = '13'; + const DEV_LEVEL = '14-dev'; /** * Development status. @@ -86,7 +86,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Stable'; + const DEV_STATUS = 'Development'; /** * Build number. @@ -119,7 +119,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '15:00'; + const RELTIME = '14:59'; /** * Release timezone. From a683afa6e5ffba9a1ddd4e73162acc383c57d91f Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Mon, 4 Nov 2019 19:40:45 +0100 Subject: [PATCH 02/42] Not tag but meta keywords (#26883) Reapply after 3.9.13 release --- language/en-GB/en-GB.mod_banners.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en-GB/en-GB.mod_banners.ini b/language/en-GB/en-GB.mod_banners.ini index 2d7281d1686d..45a39469945d 100644 --- a/language/en-GB/en-GB.mod_banners.ini +++ b/language/en-GB/en-GB.mod_banners.ini @@ -19,7 +19,7 @@ MOD_BANNERS_FIELD_HEADER_DESC="Text or HTML to display before the group of banne MOD_BANNERS_FIELD_HEADER_LABEL="Header Text" MOD_BANNERS_FIELD_RANDOMISE_DESC="Randomise the ordering of the banners." MOD_BANNERS_FIELD_RANDOMISE_LABEL="Randomise" -MOD_BANNERS_FIELD_TAG_DESC="Banner is selected by matching the banner tags to the current document meta keywords." +MOD_BANNERS_FIELD_TAG_DESC="Banner is selected by matching the banner meta keywords to the current document meta keywords." MOD_BANNERS_FIELD_TAG_LABEL="Search by Meta Keyword" MOD_BANNERS_FIELD_TARGET_DESC="Target window when the link is selected." MOD_BANNERS_FIELD_TARGET_LABEL="Target" From b4d3d68744d7040a33bdf86fb2e3339ef05b186f Mon Sep 17 00:00:00 2001 From: Thomas Hunziker Date: Tue, 5 Nov 2019 19:57:39 +0100 Subject: [PATCH 03/42] Updating cy-GB installation language files --- installation/language/cy-GB/cy-GB.ini | 47 ++++++++++++++------------- installation/language/cy-GB/cy-GB.xml | 10 +++--- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/installation/language/cy-GB/cy-GB.ini b/installation/language/cy-GB/cy-GB.ini index 798d120e5c5a..44d56bdb7d80 100644 --- a/installation/language/cy-GB/cy-GB.ini +++ b/installation/language/cy-GB/cy-GB.ini @@ -19,7 +19,7 @@ INSTL_WARNJSON="Mae’n rhaid galluogi JSON yn eich gosodiad o PHP er mwyn gosod ;Preinstall view INSTL_PRECHECK_TITLE="Gwiriad cyn gosod" -INSTL_PRECHECK_DESC="Os yw unrhyw un o’r eitemau yma heb ei gefnogi (wedi ei farcio Na) yna cymerwch gamau i’w gywiro.
Ni fedrwch osod Joomla! nes bod eich system yn cydfynd efo’r gofynion isod." +INSTL_PRECHECK_DESC="Os yw unrhyw un o’r eitemau yma heb ei gefnogi (wedi ei farcio Na) yna cymerwch gamau i’w gywiro.
Ni fedrwch osod Joomla! nes bod eich system yn cydfynd efo’r gofynion isod." INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Gosodiadau a argymhellir:" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Argymhellir y gosodiadau yma ar gyfer PHP i sicrhau cydnawsedd llwyr efo Joomla!.
Serch hynny, bydd Joomla! yn gweithio os nad yw eich gosodiadau yn llwyr gyfateb efo’r ffurfweddiad sy’n cael ei argymell." INSTL_PRECHECK_DIRECTIVE="Cyfarwyddeb" @@ -29,22 +29,22 @@ INSTL_PRECHECK_ACTUAL="Gwirioneddol" ; Database view INSTL_DATABASE="Ffurfweddiad cronfa ddata" INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Ymholiad cronfa ddata PostgreSQL wedi methu." -INSTL_DATABASE_HOST_DESC="\"localhost\" yw hwn fel arfer neu enw a ddarperir gan eich cwmni lletya." +INSTL_DATABASE_HOST_DESC=""_QQ_"localhost"_QQ_" yw hwn fel arfer neu enw a ddarperir gan eich cwmni lletya." INSTL_DATABASE_HOST_LABEL="Enw'r lletywr" -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nid oeddem yn gallu creu'r ffeil. Crëwch ffeil o'r enw \"%1$s\" a'i uwchlwytho i ffolder \"%2$s\" eich gwefan Joomla." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="I gadarnhau mai chi yw perchennog y wefan hon dilëwch y ffeil o'r enw \"%1$s\" yr ydym newydd ei chreu yn ffolder \"%2$s\" eich gwefan Joomla." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Yr ydych yn ceisio defnyddio gwesteiwr cronfa ddata nad yw ar eich gweinydd lleol. Am resymau diogelwch, mae angen i chi wirio perchnogaeth eich cyfrif gwe-letya. Darllenwch y dogfennau am fwy o wybodaeth." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nid oeddem yn gallu creu'r ffeil. Crëwch ffeil o'r enw "_QQ_"%1$s"_QQ_" a'i uwchlwytho i ffolder "_QQ_"%2$s"_QQ_" eich gwefan Joomla." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="I gadarnhau mai chi yw perchennog y wefan hon dilëwch y ffeil o'r enw "_QQ_"%1$s"_QQ_" yr ydym newydd ei chreu yn ffolder "_QQ_"%2$s"_QQ_" eich gwefan Joomla." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Yr ydych yn ceisio defnyddio gwesteiwr cronfa ddata nad yw ar eich gweinydd lleol. Am resymau diogelwch, mae angen i chi wirio perchnogaeth eich cyfrif gwe-letya. Darllenwch y dogfennau am fwy o wybodaeth." INSTL_DATABASE_NAME_DESC="Mae rhai lletywyr ond yn caniatau enw cronfa ddata arbennig ar gyfer pob gwefan. Yn yr achos yma defnyddiwch rhagddodiad tabl ar gyfer pob gwefan Joomla." INSTL_DATABASE_NAME_LABEL="Nid oes sgema cronfa ddata yn bodoli ar gyfer y math hwn o gronfa ddata." INSTL_DATABASE_NO_SCHEMA="Nid oes sgema cronfa ddata yn bodoli ar gyfer y math hwn o gronfa ddata." -INSTL_DATABASE_OLD_PROCESS_DESC="\"Gwneud copi wrth gefn\" neu \"Dynnu\" unrhyw dablau sy'n bodoli o hen osodiadau Joomla! gyda yr un \"Rhagddodiad Tabl\"." +INSTL_DATABASE_OLD_PROCESS_DESC=""_QQ_"Gwneud copi wrth gefn"_QQ_" neu "_QQ_"Dynnu"_QQ_" unrhyw dablau sy'n bodoli o hen osodiadau Joomla! gyda yr un "_QQ_"Rhagddodiad Tabl"_QQ_"." INSTL_DATABASE_OLD_PROCESS_LABEL="Hen broses cronfa ddata" INSTL_DATABASE_PASSWORD_DESC="Mae defnyddio cyfrinair ar gyfer eich cyfrif cronfa ddata yn orfodol er mwyn sicrhau diogelwch eich safle." INSTL_DATABASE_PASSWORD_LABEL="Cyfrinair:" INSTL_DATABASE_PREFIX_DESC="Crëwch ragddodiad tabl neu defnyddiwch yr un a grëwyd ar hap. Yn ddelfrydol yn dri neu bedwar o nodau mewn hyd, yn cynnwys nodau alffaniwmerig yn unig a RHAID diweddu efo nod tanlinell. Sicrhewch nad yw'r rhagddodiad a ddefnyddir yn cael ei ddefnyddio ar gyfer tablau eraill ." INSTL_DATABASE_PREFIX_LABEL="Rhagddodiad Tabl" INSTL_DATABASE_PREFIX_MSG="Rhaid i’r rhagddodiad tabl dechrau efo llythyren, cael ei ddilyn gan nodau alffaniwmerig dewisiol a tanlinelliad." -INSTL_DATABASE_TYPE_DESC="Y mae hwn yn debygol o fod yn \"MySQLi\"" +INSTL_DATABASE_TYPE_DESC="Y mae hwn yn debygol o fod yn "_QQ_"MySQLi"_QQ_"" INSTL_DATABASE_TYPE_LABEL="Math o gronfa ddata" INSTL_DATABASE_USER_DESC="Naill ai enw defnyddiwr a grëwyd gennych chi neu un a roddwyd gan y lletywr." INSTL_DATABASE_USER_LABEL="Enw defnyddiwr:" @@ -60,7 +60,7 @@ INSTL_FTP_PASSWORD_LABEL="Cyfrinair FTP" INSTL_FTP_PORT_LABEL="Porth FTP" INSTL_FTP_ROOT_LABEL="Llwybr gwraidd FTP" INSTL_FTP_SAVE_LABEL="Cadw'r cyfrinair FTP" -INSTL_FTP_TITLE="Ffurfweddiad FTP (Dewisol – Gall y rhan fwyaf o ddefnyddwyr anwybyddu’r cam yma – gwasgwch Nesaf i anwybyddu)" +INSTL_FTP_TITLE="Ffurfweddiad FTP (Dewisol – Gall y rhan fwyaf o ddefnyddwyr anwybyddu’r cam yma – gwasgwch Nesaf i anwybyddu)" INSTL_FTP_USER_LABEL="Enw Defnyddiwr FTP" INSTL_VERIFY_FTP_SETTINGS="Gwirio gosodiadau FTP" INSTL_FTP_SETTINGS_CORRECT="Gosodiadau’n gywir" @@ -122,14 +122,14 @@ INSTL_EMAIL_NOT_SENT="Manylion mewngofnodi gweinyddol" ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Manylion mewngofnodi gweinyddol" -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Mae'r ffolder \"%s\" eisoes wedi'i dileu." +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Mae'r ffolder "_QQ_"%s"_QQ_" eisoes wedi'i dileu." INSTL_COMPLETE_ERROR_FOLDER_DELETE="Doedd dim modd dileu'r ffolder \"%s\". Os gwelwch yn dda dilëwch y ffolder eich hun." INSTL_COMPLETE_FOLDER_REMOVED="Wedi llwyddo i dynnu'r ffolder gosod \"%s\"." INSTL_COMPLETE_LANGUAGE_1="Joomla! yn eich iaith a/neu creu gwefan sylfaenol amlieithog brodorol yn awtomatig" -INSTL_COMPLETE_LANGUAGE_DESC="Cyn tynnu’r ffolder \"%s\" medrwch osod ieithoedd ychwanegol. Os ydych eisiau ychwanegu ieithoedd i'ch gwefan Joomla cliciwch y botwm canlynol." +INSTL_COMPLETE_LANGUAGE_DESC="Cyn tynnu’r ffolder "_QQ_"%s"_QQ_" medrwch osod ieithoedd ychwanegol. Os ydych eisiau ychwanegu ieithoedd i'ch gwefan Joomla cliciwch y botwm canlynol." INSTL_COMPLETE_LANGUAGE_DESC2="Nodyn: Bydd angen mynediad i’r Rhyngrwyd arnoch i Joomla lawrlwytho a gosod yr iaith newydd.
Nid yw rhai gosodiadau gweinydd yn caniatau Joomla i osod ieithoedd. Os dyna sy’n wir yma, peidiwch a phoeni, medrwch ei osod wedyn gan ddefnyddio Gweinyddwr Joomla." -INSTL_COMPLETE_REMOVE_FOLDER="Tynnwch y ffolder \"%s\"" -INSTL_COMPLETE_REMOVE_INSTALLATION="COFIWCH DYNNU Y FFOLDER GOSOD YN LLWYR OS GWELWCH YN DDA.
Ni fyddwch yn gallu parhau heibio’r pwynt yma nes bod y ffolder \"%s\" wedi ei thynnu. Nodwedd diogelwch yn Joomla yw hyn." +INSTL_COMPLETE_REMOVE_FOLDER="Tynnwch y ffolder "_QQ_"%s"_QQ_"" +INSTL_COMPLETE_REMOVE_INSTALLATION="COFIWCH DYNNU Y FFOLDER GOSOD YN LLWYR OS GWELWCH YN DDA.
Ni fyddwch yn gallu parhau heibio’r pwynt yma nes bod y ffolder "_QQ_"%s"_QQ_" wedi ei thynnu. Nodwedd diogelwch yn Joomla yw hyn." INSTL_COMPLETE_TITLE="Llongyfarchiadau! Mae Joomla! wedi’i osod." INSTL_COMPLETE_INSTALL_LANGUAGES="Camau ychwanegol: Gosod Ieithoedd " @@ -168,6 +168,7 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Ni allodd J INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Ni allodd Joomla alluogi yr Ategyn Cod Iaith yn awtomatig." INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Ni allodd Joomla alluogi yr Ategyn Hidlo Iaith yn awtomatig." INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Ni allodd Joomla osod yr iaith %s." +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_MULTILANG="Ni lwyddodd Joomla i osod sampl ddata amlieithog achos mai ond un iaith sydd wedi ei gosod. I roi y nodwedd amlieithog ar waith rhaid gosod mwy o ieithoedd, pwyswch y botwm 'Blaenorol' a dewis ieithoedd o'r rhestr." INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Ni allodd Joomla gyhoeddi’r modiwl statws iaith yn awtomatig." INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Ni allodd Joomla ddadgyhoeddi’r modiwl dewislen diofyn yn awtomatig." INSTL_DEFAULTLANGUAGE_DESC="Mae Joomla wedi gosod yr ieithoedd canlynol. Dewiswch yr iaith ddiofyn ar gyfer Gweinyddwr Joomla os gwelwch yn dda." @@ -205,7 +206,7 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Mae angen gweinydd SQL 2008 R2 (10.50.160 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Mae angen SQL Server 2008 R2 (10.50.1600.1) neu uwch arnoch er mwyn parhau i osod. Eich fersiwn yw: %s" INSTL_DATABASE_INVALID_TYPE="Dewiswch math y gronfa ddata" INSTL_DATABASE_NAME_TOO_LONG="Ni ddylai enw y gronfa ddata MySQL fod yn fwy na 64 nod." -INSTL_DATABASE_INVALID_NAME="Ni all fersiynau o MySQL cyn 5.1.6 gynnwys atalnodau llawn na nodau \"arbennig\" eraill yn yr enw. Eich fersiwn yw: %s" +INSTL_DATABASE_INVALID_NAME="Ni all fersiynau o MySQL cyn 5.1.6 gynnwys atalnodau llawn na nodau "_QQ_"arbennig"_QQ_" eraill yn yr enw. Eich fersiwn yw: %s" INSTL_DATABASE_NAME_INVALID_SPACES="Ni all enwau cronfa ddata MySQL ac enwau tablau ddechrau neu ddiweddu gyda bylchau." INSTL_DATABASE_NAME_INVALID_CHAR="Ni all unrhyw ddynodwr MySQL gynnwys NWL ASCII(0x00)." INSTL_DATABASE_FILE_DOES_NOT_EXIST="Nid yw ffeil %s yn bodoli" @@ -224,18 +225,18 @@ INSTL_STD_OFFLINE_MSG="Nid yw'r wefan ar-lein achos fod gwaith cynnal a chadw i' ;FTP model INSTL_FTP_INVALIDROOT="Nid y ffolder FTP a benodwyd yw ffolder y gosodiad Joomla!" INSTL_FTP_NOCONNECT="Methu cysylltu gyda’r gweinydd FTP" -INSTL_FTP_NODELE="Mae’r swyddogaeth \"DELE\" wedi methu." +INSTL_FTP_NODELE="Mae’r swyddogaeth "_QQ_"DELE"_QQ_" wedi methu." INSTL_FTP_NODIRECTORYLISTING="Heb lwyddo i adfer rhestr ffolderi oddi ar y gweinydd FTP." -INSTL_FTP_NOLIST="Mae'r swyddogaeth \"LIST\" wedi methu." +INSTL_FTP_NOLIST="Mae'r swyddogaeth "_QQ_"LIST"_QQ_" wedi methu." INSTL_FTP_NOLOGIN="Methu mewngofnodi i’r gweinydd FTP." -INSTL_FTP_NOMKD="Mae’r swyddogaeth \"MKD\" wedi methu." -INSTL_FTP_NONLST="Mae’r swyddogaeth \"NLST\" wedi methu." -INSTL_FTP_NOPWD="Mae’r swyddogaeth \"PWD\" wedi methu." -INSTL_FTP_NORETR="Mae’r swyddogaeth \"RETR\" wedi methu." -INSTL_FTP_NORMD="Mae’r swyddogaeth \"RMD\" wedi methu." +INSTL_FTP_NOMKD="Mae’r swyddogaeth "_QQ_"MKD"_QQ_" wedi methu." +INSTL_FTP_NONLST="Mae’r swyddogaeth "_QQ_"NLST"_QQ_" wedi methu." +INSTL_FTP_NOPWD="Mae’r swyddogaeth "_QQ_"PWD"_QQ_" wedi methu." +INSTL_FTP_NORETR="Mae’r swyddogaeth "_QQ_"RETR"_QQ_" wedi methu." +INSTL_FTP_NORMD="Mae’r swyddogaeth "_QQ_"RMD"_QQ_" wedi methu." INSTL_FTP_NOROOT="Nid oedd y ffolder FTP a benodwyd yn hygyrch." -INSTL_FTP_NOSTOR="Mae’r swyddogaeth \"STOR\" wedi methu." -INSTL_FTP_NOSYST="Mae’r swyddogaeth \"SYST\" wedi methu." +INSTL_FTP_NOSTOR="Mae’r swyddogaeth "_QQ_"STOR"_QQ_" wedi methu." +INSTL_FTP_NOSYST="Mae’r swyddogaeth "_QQ_"SYST"_QQ_" wedi methu." INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Does dim modd canfod y ffolder wraidd FTP yn awtomatig." ;others @@ -338,6 +339,6 @@ WARNING="Rhybudd" JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Terfynwyd y cysylltiad wrth nôl data JSON." JLIB_JS_AJAX_ERROR_NO_CONTENT="Ni ddychwelwyd cynnwys." JLIB_JS_AJAX_ERROR_OTHER="Gwall wrth nôl data JSON: Cod statws HTTP %s." -JLIB_JS_AJAX_ERROR_PARSE="Gwall dosrannu tra'n prosesu y data JSON canlynol:
%s" +JLIB_JS_AJAX_ERROR_PARSE="Gwall dosrannu tra'n prosesu y data JSON canlynol:
%s" JLIB_JS_AJAX_ERROR_TIMEOUT="Amser wedi dod i ben tra'n nôl y data JSON." diff --git a/installation/language/cy-GB/cy-GB.xml b/installation/language/cy-GB/cy-GB.xml index dec51da86e77..bb30b9814c1d 100644 --- a/installation/language/cy-GB/cy-GB.xml +++ b/installation/language/cy-GB/cy-GB.xml @@ -1,12 +1,10 @@ - + Cymraeg - 3.9.0 - October 2018 + 3.9.14 + October 2019 Welsh Translation Team : Joomla.cymru - Copyright (C) 2005 - 2018 Joomla.cymru and Open Source Matters, Inc. All rights reserved. + Copyright (C) 2005 - 2019 Joomla.cymru and Open Source Matters, Inc. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt cy-GB.ini From 8873481ef66297defc5c1d189a802f95ad57bbf0 Mon Sep 17 00:00:00 2001 From: Thomas Hunziker Date: Wed, 6 Nov 2019 17:20:47 +0100 Subject: [PATCH 04/42] Updated ja-JP installation language file. --- installation/language/ja-JP/ja-JP.ini | 1 + installation/language/ja-JP/ja-JP.xml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/installation/language/ja-JP/ja-JP.ini b/installation/language/ja-JP/ja-JP.ini index d341e5f23a27..c8c762f19251 100644 --- a/installation/language/ja-JP/ja-JP.ini +++ b/installation/language/ja-JP/ja-JP.ini @@ -168,6 +168,7 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="自動的 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="自動的に言語コードプラグインを有効にできませんでした。" INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="自動的に言語フィルタプラグインを有効にできませんでした。" INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="%s 言語をインストールできませんでした。" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_MULTILANG="1言語しかインストールされていないため、Joomlaは多言語サンプルデータをインストールできませんでした。多言語機能を有効にするには、追加の言語をインストールし、「前へ」ボタンを押して、一覧から目的の言語を選択する必要があります。" INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="自動的に多言語ステータスモジュールを有効にできませんでした。" INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="自動的にデフォルトのメニューモジュールを非表示にできませんでした。" INSTL_DEFAULTLANGUAGE_DESC="Joomla!には次の言語がインストールされています。管理画面で使用する標準言語を選択してください。" diff --git a/installation/language/ja-JP/ja-JP.xml b/installation/language/ja-JP/ja-JP.xml index 64b02bfaeffb..33b16f31fb8a 100644 --- a/installation/language/ja-JP/ja-JP.xml +++ b/installation/language/ja-JP/ja-JP.xml @@ -1,8 +1,8 @@ - Japanese 日本語 (Japan) - 3.9.2 - November 2018 + Japanese (Japan) + 3.9.14 + November 2019 Joomla.jp Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt @@ -10,7 +10,7 @@ ja-JP.ini - Japanese 日本語 (Japan) + Japanese (ja-JP) 日本語 (Japan) ja-JP 0 From 850e32956add18a1cc700f61ac46ff8358813fdb Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Thu, 7 Nov 2019 20:06:43 +0000 Subject: [PATCH 05/42] Update suggestions.json.php (#26952) --- components/com_finder/controllers/suggestions.json.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/com_finder/controllers/suggestions.json.php b/components/com_finder/controllers/suggestions.json.php index 4fe75ff9cdf1..b185d626e4cb 100644 --- a/components/com_finder/controllers/suggestions.json.php +++ b/components/com_finder/controllers/suggestions.json.php @@ -17,7 +17,7 @@ class FinderControllerSuggestions extends JControllerLegacy { /** - * Method to find search query suggestions. Uses jQuery and autocopleter.js + * Method to find search query suggestions. Uses jQuery and autocompleter.js * * @return void * From cfb4cdf32ca004413afed08b314659a6010efb4b Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Thu, 7 Nov 2019 20:07:10 +0000 Subject: [PATCH 06/42] s/sumitted/submitted (#26953) --- components/com_config/controller/modules/save.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/com_config/controller/modules/save.php b/components/com_config/controller/modules/save.php index 128cb6707145..97ab33aa1b15 100644 --- a/components/com_config/controller/modules/save.php +++ b/components/com_config/controller/modules/save.php @@ -47,7 +47,7 @@ public function execute() // Set FTP credentials, if given. JClientHelper::setCredentialsFromRequest('ftp'); - // Get sumitted module id + // Get submitted module id $moduleId = '&id=' . $this->input->get('id'); // Get returnUri From bbf5b499c28a4035b38a45716433909e8997beba Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Thu, 7 Nov 2019 20:07:36 +0000 Subject: [PATCH 07/42] Fix comment show (#26954) --- administrator/includes/subtoolbar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/includes/subtoolbar.php b/administrator/includes/subtoolbar.php index 1e1ef10610a3..a8b2f0e16750 100644 --- a/administrator/includes/subtoolbar.php +++ b/administrator/includes/subtoolbar.php @@ -106,7 +106,7 @@ public static function getEntries() * @param string $label Label for the menu item. * @param string $name name for the filter. Also used as id. * @param string $options options for the select field. - * @param boolean $noDefault Don't the label as the empty option + * @param boolean $noDefault Don't show the label as the empty option * * @return void * From e15c444b0ab2447f929eb4f5fabb2855ab176b19 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Thu, 7 Nov 2019 20:08:00 +0000 Subject: [PATCH 08/42] Fix comment +show (#26955) --- libraries/cms/html/sidebar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/cms/html/sidebar.php b/libraries/cms/html/sidebar.php index 08da16298a52..407439444d5e 100644 --- a/libraries/cms/html/sidebar.php +++ b/libraries/cms/html/sidebar.php @@ -98,7 +98,7 @@ public static function getEntries() * @param string $label Label for the menu item. * @param string $name Name for the filter. Also used as id. * @param string $options Options for the select field. - * @param bool $noDefault Don't the label as the empty option + * @param bool $noDefault Don't show the label as the empty option * * @return void * From dc57b4f71d787c81346107a4fd8f85e4e8b00503 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Thu, 7 Nov 2019 20:08:13 +0000 Subject: [PATCH 09/42] remove extra whitespace (#26957) --- administrator/components/com_languages/controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_languages/controller.php b/administrator/components/com_languages/controller.php index 85b2c627dd10..8e88bde0e527 100644 --- a/administrator/components/com_languages/controller.php +++ b/administrator/components/com_languages/controller.php @@ -17,7 +17,7 @@ class LanguagesController extends JControllerLegacy { /** - * @var string The default view. + * @var string The default view. * @since 1.6 */ protected $default_view = 'installed'; From d65e24ffc458a94674bbc62a0b6b36f717cdf759 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Thu, 7 Nov 2019 20:08:26 +0000 Subject: [PATCH 10/42] remove whitespace/tabs (#26958) remove whitespace/tabs --- .../components/com_languages/controllers/strings.json.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_languages/controllers/strings.json.php b/administrator/components/com_languages/controllers/strings.json.php index c8d11ef63b42..d56b1ac8e0a9 100644 --- a/administrator/components/com_languages/controllers/strings.json.php +++ b/administrator/components/com_languages/controllers/strings.json.php @@ -21,7 +21,7 @@ class LanguagesControllerStrings extends JControllerAdmin * * @return void * - * @since 2.5 + * @since 2.5 */ public function refresh() { @@ -33,7 +33,7 @@ public function refresh() * * @return void * - * @since 2.5 + * @since 2.5 */ public function search() { From bae4968ae6adde4eea6aef6c31007914d0e88a0c Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Thu, 7 Nov 2019 20:08:37 +0000 Subject: [PATCH 11/42] s/dlete/delete, remove whitespace/tabs (#26959) s/dlete/delete, remove whitespace/tabs --- .../components/com_languages/controllers/overrides.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_languages/controllers/overrides.php b/administrator/components/com_languages/controllers/overrides.php index ec3d7a743338..b9c0e564ae30 100644 --- a/administrator/components/com_languages/controllers/overrides.php +++ b/administrator/components/com_languages/controllers/overrides.php @@ -29,14 +29,14 @@ class LanguagesControllerOverrides extends JControllerAdmin * * @return void * - * @since 2.5 + * @since 2.5 */ public function delete() { // Check for request forgeries. $this->checkToken(); - // Get items to dlete from the request. + // Get items to delete from the request. $cid = $this->input->get('cid', array(), 'array'); if (!is_array($cid) || count($cid) < 1) From 231740ba3634ec8eefabb8108f270eaae32bebf9 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Thu, 7 Nov 2019 21:10:25 +0100 Subject: [PATCH 12/42] Composer update (#26879) psr/log (definition only) joomla/filesystem (php 7.4 fixes) --- composer.lock | 45 +++++++++---------- libraries/vendor/composer/autoload_psr4.php | 1 - libraries/vendor/composer/autoload_static.php | 5 --- libraries/vendor/composer/installed.json | 37 ++++++++------- .../vendor/joomla/event/src/AbstractEvent.php | 10 ++--- .../joomla/event/src/DelegatingDispatcher.php | 6 +-- .../vendor/joomla/event/src/Dispatcher.php | 29 +++++------- .../event/src/DispatcherAwareInterface.php | 2 +- .../joomla/event/src/DispatcherAwareTrait.php | 2 +- .../joomla/event/src/DispatcherInterface.php | 2 +- libraries/vendor/joomla/event/src/Event.php | 6 +-- .../joomla/event/src/EventImmutable.php | 2 +- .../joomla/event/src/EventInterface.php | 2 +- .../event/src/ListenersPriorityQueue.php | 12 ++--- .../vendor/joomla/event/src/Priority.php | 12 ++--- .../psr/log/Psr/Log/LoggerInterface.php | 2 + .../vendor/psr/log/Psr/Log/LoggerTrait.php | 2 + .../vendor/psr/log/Psr/Log/NullLogger.php | 2 + 18 files changed, 85 insertions(+), 94 deletions(-) diff --git a/composer.lock b/composer.lock index 76e007b6f33c..29e2e3e142c1 100644 --- a/composer.lock +++ b/composer.lock @@ -377,24 +377,24 @@ }, { "name": "joomla/event", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/event.git", - "reference": "d8cc2a4757c4556f0ab12e58903e9d168077018b" + "reference": "ea97afdc7afd78cc9a0500f4b60372764fc2c0b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/event/zipball/d8cc2a4757c4556f0ab12e58903e9d168077018b", - "reference": "d8cc2a4757c4556f0ab12e58903e9d168077018b", + "url": "https://api.github.com/repos/joomla-framework/event/zipball/ea97afdc7afd78cc9a0500f4b60372764fc2c0b0", + "reference": "ea97afdc7afd78cc9a0500f4b60372764fc2c0b0", "shasum": "" }, "require": { - "php": ">=5.3.10|>=7.0" + "php": "^5.3.10|~7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "1.*" + "joomla/coding-standards": "~2.0@alpha", + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0" }, "type": "joomla-package", "extra": { @@ -404,13 +404,12 @@ }, "autoload": { "psr-4": { - "Joomla\\Event\\": "src/", - "Joomla\\Event\\Tests\\": "Tests/" + "Joomla\\Event\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "Joomla Event Package", "homepage": "https://github.com/joomla-framework/event", @@ -419,7 +418,7 @@ "framework", "joomla" ], - "time": "2016-03-13T19:41:09+00:00" + "time": "2019-10-07T22:54:58+00:00" }, { "name": "joomla/filesystem", @@ -1234,16 +1233,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", + "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", "shasum": "" }, "require": { @@ -1252,7 +1251,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1277,7 +1276,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-10-25T08:06:51+00:00" }, { "name": "simplepie/simplepie", @@ -1979,22 +1978,22 @@ }, { "name": "phpspec/prophecy", - "version": "1.8.1", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -2038,7 +2037,7 @@ "spy", "stub" ], - "time": "2019-06-13T12:50:23+00:00" + "time": "2019-10-03T11:07:50+00:00" }, { "name": "phpunit/dbunit", diff --git a/libraries/vendor/composer/autoload_psr4.php b/libraries/vendor/composer/autoload_psr4.php index 1b034a88523b..addd1bb2f8bc 100644 --- a/libraries/vendor/composer/autoload_psr4.php +++ b/libraries/vendor/composer/autoload_psr4.php @@ -26,7 +26,6 @@ 'Joomla\\Image\\' => array($vendorDir . '/joomla/image/src'), 'Joomla\\Filter\\' => array($vendorDir . '/joomla/filter/src'), 'Joomla\\Filesystem\\' => array($vendorDir . '/joomla/filesystem/src'), - 'Joomla\\Event\\Tests\\' => array($vendorDir . '/joomla/event/Tests'), 'Joomla\\Event\\' => array($vendorDir . '/joomla/event/src'), 'Joomla\\Data\\Tests\\' => array($vendorDir . '/joomla/data/Tests'), 'Joomla\\Data\\' => array($vendorDir . '/joomla/data/src'), diff --git a/libraries/vendor/composer/autoload_static.php b/libraries/vendor/composer/autoload_static.php index dc6f5322177e..0d67159b4eef 100644 --- a/libraries/vendor/composer/autoload_static.php +++ b/libraries/vendor/composer/autoload_static.php @@ -67,7 +67,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe 'Joomla\\Image\\' => 13, 'Joomla\\Filter\\' => 14, 'Joomla\\Filesystem\\' => 18, - 'Joomla\\Event\\Tests\\' => 19, 'Joomla\\Event\\' => 13, 'Joomla\\Data\\Tests\\' => 18, 'Joomla\\Data\\' => 12, @@ -162,10 +161,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe array ( 0 => __DIR__ . '/..' . '/joomla/filesystem/src', ), - 'Joomla\\Event\\Tests\\' => - array ( - 0 => __DIR__ . '/..' . '/joomla/event/Tests', - ), 'Joomla\\Event\\' => array ( 0 => __DIR__ . '/..' . '/joomla/event/src', diff --git a/libraries/vendor/composer/installed.json b/libraries/vendor/composer/installed.json index f20598dd8041..8a0fd5eb0d4b 100644 --- a/libraries/vendor/composer/installed.json +++ b/libraries/vendor/composer/installed.json @@ -386,27 +386,27 @@ }, { "name": "joomla/event", - "version": "1.2.0", - "version_normalized": "1.2.0.0", + "version": "1.3.0", + "version_normalized": "1.3.0.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/event.git", - "reference": "d8cc2a4757c4556f0ab12e58903e9d168077018b" + "reference": "ea97afdc7afd78cc9a0500f4b60372764fc2c0b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/event/zipball/d8cc2a4757c4556f0ab12e58903e9d168077018b", - "reference": "d8cc2a4757c4556f0ab12e58903e9d168077018b", + "url": "https://api.github.com/repos/joomla-framework/event/zipball/ea97afdc7afd78cc9a0500f4b60372764fc2c0b0", + "reference": "ea97afdc7afd78cc9a0500f4b60372764fc2c0b0", "shasum": "" }, "require": { - "php": ">=5.3.10|>=7.0" + "php": "^5.3.10|~7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "1.*" + "joomla/coding-standards": "~2.0@alpha", + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0" }, - "time": "2016-03-13T19:41:09+00:00", + "time": "2019-10-07T22:54:58+00:00", "type": "joomla-package", "extra": { "branch-alias": { @@ -416,13 +416,12 @@ "installation-source": "dist", "autoload": { "psr-4": { - "Joomla\\Event\\": "src/", - "Joomla\\Event\\Tests\\": "Tests/" + "Joomla\\Event\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "Joomla Event Package", "homepage": "https://github.com/joomla-framework/event", @@ -1275,27 +1274,27 @@ }, { "name": "psr/log", - "version": "1.1.0", - "version_normalized": "1.1.0.0", + "version": "1.1.1", + "version_normalized": "1.1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", + "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2018-11-20T15:27:04+00:00", + "time": "2019-10-25T08:06:51+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "installation-source": "dist", diff --git a/libraries/vendor/joomla/event/src/AbstractEvent.php b/libraries/vendor/joomla/event/src/AbstractEvent.php index 59bfef644e05..1644010a656b 100644 --- a/libraries/vendor/joomla/event/src/AbstractEvent.php +++ b/libraries/vendor/joomla/event/src/AbstractEvent.php @@ -2,15 +2,15 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ namespace Joomla\Event; -use Serializable; use ArrayAccess; use Countable; +use Serializable; /** * Implementation of EventInterface. @@ -56,7 +56,7 @@ abstract class AbstractEvent implements EventInterface, ArrayAccess, Serializabl */ public function __construct($name, array $arguments = array()) { - $this->name = $name; + $this->name = $name; $this->arguments = $arguments; } @@ -128,7 +128,7 @@ public function getArguments() */ public function isStopped() { - return true === $this->stopped; + return $this->stopped === true; } /** @@ -140,7 +140,7 @@ public function isStopped() */ public function count() { - return count($this->arguments); + return \count($this->arguments); } /** diff --git a/libraries/vendor/joomla/event/src/DelegatingDispatcher.php b/libraries/vendor/joomla/event/src/DelegatingDispatcher.php index 600bfd628df2..29017c8be090 100644 --- a/libraries/vendor/joomla/event/src/DelegatingDispatcher.php +++ b/libraries/vendor/joomla/event/src/DelegatingDispatcher.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ @@ -11,7 +11,8 @@ /** * A dispatcher delegating its methods to an other dispatcher. * - * @since 1.0 + * @since 1.0 + * @deprecated 2.0 Create your own delegating (decorating) dispatcher as needed. */ final class DelegatingDispatcher implements DispatcherInterface { @@ -19,7 +20,6 @@ final class DelegatingDispatcher implements DispatcherInterface * The delegated dispatcher. * * @var DispatcherInterface - * * @since 1.0 */ private $dispatcher; diff --git a/libraries/vendor/joomla/event/src/Dispatcher.php b/libraries/vendor/joomla/event/src/Dispatcher.php index 423abee984a7..fdaaf45e9ea5 100644 --- a/libraries/vendor/joomla/event/src/Dispatcher.php +++ b/libraries/vendor/joomla/event/src/Dispatcher.php @@ -2,14 +2,14 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ namespace Joomla\Event; -use InvalidArgumentException; use Closure; +use InvalidArgumentException; /** * Implementation of a DispatcherInterface supporting @@ -34,7 +34,7 @@ class Dispatcher implements DispatcherInterface * * @var string * @since 1.0 - * @deprecated + * @deprecated 1.1.0 */ protected $listenerFilter; @@ -73,7 +73,7 @@ public function setEvent(EventInterface $event) * @return Dispatcher This method is chainable. * * @since 1.0 - * @deprecated Incorporate a method in your listener object such as `getEvents` to feed into the `setListener` method. + * @deprecated 1.1.0 Incorporate a method in your listener object such as `getEvents` to feed into the `setListener` method. */ public function setListenerFilter($regex) { @@ -186,7 +186,7 @@ public function getEvents() */ public function clearEvents() { - $events = $this->events; + $events = $this->events; $this->events = array(); return $events; @@ -201,7 +201,7 @@ public function clearEvents() */ public function countEvents() { - return count($this->events); + return \count($this->events); } /** @@ -221,7 +221,7 @@ public function countEvents() */ public function addListener($listener, array $events = array()) { - if (!is_object($listener)) + if (!\is_object($listener)) { throw new InvalidArgumentException('The given listener is not an object.'); } @@ -231,8 +231,7 @@ public function addListener($listener, array $events = array()) { if (empty($events)) { - throw new InvalidArgumentException('No event name(s) and priority - specified for the Closure listener.'); + throw new InvalidArgumentException('No event name(s) and priority specified for the Closure listener.'); } foreach ($events as $name => $priority) @@ -300,8 +299,6 @@ public function getListenerPriority($listener, $event) { return $this->listeners[$event]->getPriority($listener); } - - return null; } /** @@ -392,7 +389,6 @@ public function removeListener($listener, $event = null) $this->listeners[$event]->remove($listener); } } - else { foreach ($this->listeners as $queue) @@ -428,7 +424,6 @@ public function clearListeners($event = null) unset($this->listeners[$event]); } } - else { $this->listeners = array(); @@ -453,7 +448,7 @@ public function countListeners($event) $event = $event->getName(); } - return isset($this->listeners[$event]) ? count($this->listeners[$event]) : 0; + return isset($this->listeners[$event]) ? \count($this->listeners[$event]) : 0; } /** @@ -473,7 +468,6 @@ public function triggerEvent($event) { $event = $this->events[$event]; } - else { $event = new Event($event); @@ -491,12 +485,11 @@ public function triggerEvent($event) if ($listener instanceof Closure) { - call_user_func($listener, $event); + \call_user_func($listener, $event); } - else { - call_user_func(array($listener, $event->getName()), $event); + \call_user_func(array($listener, $event->getName()), $event); } } } diff --git a/libraries/vendor/joomla/event/src/DispatcherAwareInterface.php b/libraries/vendor/joomla/event/src/DispatcherAwareInterface.php index b5fecc1c27ce..84b2695a23ba 100644 --- a/libraries/vendor/joomla/event/src/DispatcherAwareInterface.php +++ b/libraries/vendor/joomla/event/src/DispatcherAwareInterface.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ diff --git a/libraries/vendor/joomla/event/src/DispatcherAwareTrait.php b/libraries/vendor/joomla/event/src/DispatcherAwareTrait.php index 9bfa0e7851e1..a0cf18d4ccb7 100644 --- a/libraries/vendor/joomla/event/src/DispatcherAwareTrait.php +++ b/libraries/vendor/joomla/event/src/DispatcherAwareTrait.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ diff --git a/libraries/vendor/joomla/event/src/DispatcherInterface.php b/libraries/vendor/joomla/event/src/DispatcherInterface.php index f77cd8189b26..2617dda08856 100644 --- a/libraries/vendor/joomla/event/src/DispatcherInterface.php +++ b/libraries/vendor/joomla/event/src/DispatcherInterface.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ diff --git a/libraries/vendor/joomla/event/src/Event.php b/libraries/vendor/joomla/event/src/Event.php index f9e831ca2ebb..0ef52e9046b2 100644 --- a/libraries/vendor/joomla/event/src/Event.php +++ b/libraries/vendor/joomla/event/src/Event.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ @@ -86,7 +86,7 @@ public function removeArgument($name) */ public function clearArguments() { - $arguments = $this->arguments; + $arguments = $this->arguments; $this->arguments = array(); return $arguments; @@ -118,7 +118,7 @@ public function stop() */ public function offsetSet($name, $value) { - if (is_null($name)) + if ($name === null) { throw new InvalidArgumentException('The argument name cannot be null.'); } diff --git a/libraries/vendor/joomla/event/src/EventImmutable.php b/libraries/vendor/joomla/event/src/EventImmutable.php index 46d4b825c349..3aa1bb2d6d8e 100644 --- a/libraries/vendor/joomla/event/src/EventImmutable.php +++ b/libraries/vendor/joomla/event/src/EventImmutable.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ diff --git a/libraries/vendor/joomla/event/src/EventInterface.php b/libraries/vendor/joomla/event/src/EventInterface.php index 42a7474d8f0a..0270358eb899 100644 --- a/libraries/vendor/joomla/event/src/EventInterface.php +++ b/libraries/vendor/joomla/event/src/EventInterface.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ diff --git a/libraries/vendor/joomla/event/src/ListenersPriorityQueue.php b/libraries/vendor/joomla/event/src/ListenersPriorityQueue.php index 22b6ecbec874..31d755221c78 100644 --- a/libraries/vendor/joomla/event/src/ListenersPriorityQueue.php +++ b/libraries/vendor/joomla/event/src/ListenersPriorityQueue.php @@ -2,16 +2,16 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ namespace Joomla\Event; -use SplPriorityQueue; -use SplObjectStorage; -use IteratorAggregate; use Countable; +use IteratorAggregate; +use SplObjectStorage; +use SplPriorityQueue; /** * A class containing an inner listeners priority queue that can be iterated multiple times. @@ -60,7 +60,7 @@ class ListenersPriorityQueue implements IteratorAggregate, Countable */ public function __construct() { - $this->queue = new SplPriorityQueue; + $this->queue = new SplPriorityQueue; $this->storage = new SplObjectStorage; } @@ -201,6 +201,6 @@ public function getIterator() */ public function count() { - return count($this->queue); + return \count($this->queue); } } diff --git a/libraries/vendor/joomla/event/src/Priority.php b/libraries/vendor/joomla/event/src/Priority.php index 9cdcc906a3a3..c87f592f29e7 100644 --- a/libraries/vendor/joomla/event/src/Priority.php +++ b/libraries/vendor/joomla/event/src/Priority.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework Event Package * - * @copyright Copyright (C) 2005 - 2016 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 */ @@ -16,11 +16,11 @@ */ final class Priority { - const MIN = -3; - const LOW = -2; + const MIN = -3; + const LOW = -2; const BELOW_NORMAL = -1; - const NORMAL = 0; + const NORMAL = 0; const ABOVE_NORMAL = 1; - const HIGH = 2; - const MAX = 3; + const HIGH = 2; + const MAX = 3; } diff --git a/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php b/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php index 5ea72438b566..e695046e30f7 100644 --- a/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php +++ b/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php @@ -118,6 +118,8 @@ public function debug($message, array $context = array()); * @param array $context * * @return void + * + * @throws \Psr\Log\InvalidArgumentException */ public function log($level, $message, array $context = array()); } diff --git a/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php b/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php index 867225df1d12..e392fef0a0cb 100644 --- a/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php +++ b/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php @@ -135,6 +135,8 @@ public function debug($message, array $context = array()) * @param array $context * * @return void + * + * @throws \Psr\Log\InvalidArgumentException */ abstract public function log($level, $message, array $context = array()); } diff --git a/libraries/vendor/psr/log/Psr/Log/NullLogger.php b/libraries/vendor/psr/log/Psr/Log/NullLogger.php index d8cd682c8f96..c8f7293b1c66 100644 --- a/libraries/vendor/psr/log/Psr/Log/NullLogger.php +++ b/libraries/vendor/psr/log/Psr/Log/NullLogger.php @@ -20,6 +20,8 @@ class NullLogger extends AbstractLogger * @param array $context * * @return void + * + * @throws \Psr\Log\InvalidArgumentException */ public function log($level, $message, array $context = array()) { From e5b315ff6939239c048bd3732cadd708a27a37de Mon Sep 17 00:00:00 2001 From: Elijah Madden Date: Wed, 13 Nov 2019 04:21:05 +0900 Subject: [PATCH 13/42] Don't call jhtml functions directly. Use _ so that they can be overridden if needed. (#27051) --- layouts/joomla/searchtools/default/bar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php index 3b1106903af5..de98d61177e1 100644 --- a/layouts/joomla/searchtools/default/bar.php +++ b/layouts/joomla/searchtools/default/bar.php @@ -40,7 +40,7 @@
input; ?> description) : ?> - JText::_($filters['filter_search']->description))); ?> + JText::_($filters['filter_search']->description))); ?>