diff --git a/administrator/components/com_config/tmpl/application/default_ftplogin.php b/administrator/components/com_config/tmpl/application/default_ftplogin.php index 8321c4fa0da25..d5c610f45268a 100644 --- a/administrator/components/com_config/tmpl/application/default_ftplogin.php +++ b/administrator/components/com_config/tmpl/application/default_ftplogin.php @@ -7,9 +7,10 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\Language\Text; -defined('_JEXEC') or die; ?>
diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini index d3eae9c254bec..15c389bbc5af3 100644 --- a/administrator/language/en-GB/en-GB.com_admin.ini +++ b/administrator/language/en-GB/en-GB.com_admin.ini @@ -6,7 +6,6 @@ COM_ADMIN="System Information" COM_ADMIN_ALPHABETICAL_INDEX="Alphabetical Index" COM_ADMIN_CACHE_DIRECTORY="(Cache Folder)" -COM_ADMIN_CLEAR_RESULTS="Clear results" COM_ADMIN_CONFIGURATION_FILE="Configuration File" COM_ADMIN_DATABASE_COLLATION="Database Collation" COM_ADMIN_DATABASE_CONNECTION_COLLATION="Database Connection Collation" @@ -21,7 +20,6 @@ COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON="Download as JSON" COM_ADMIN_EXTENSIONS="Extensions" COM_ADMIN_FILE_UPLOADS="File Uploads" COM_ADMIN_GLOSSARY="Glossary" -COM_ADMIN_GO="Go" COM_ADMIN_HELP="Joomla! Help" COM_ADMIN_HELP_COMPONENTS_ASSOCIATIONS="Multilingual Associations" COM_ADMIN_HELP_COMPONENTS_ASSOCIATIONS_EDIT="Multilingual Associations: Select" @@ -107,15 +105,12 @@ COM_ADMIN_HELP_USERS_USER_NOTES_EDIT="Users: User Notes - New/Edit" COM_ADMIN_HELP_USERS_USER_MANAGER="Users" COM_ADMIN_HELP_USERS_USER_MANAGER_EDIT="Users: New/Edit" COM_ADMIN_ICONV_AVAILABLE="Iconv Available" -COM_ADMIN_INFORMATION="System Information" COM_ADMIN_JOOMLA_VERSION="Joomla! Version" COM_ADMIN_LATEST_VERSION_CHECK="Latest Version Check" COM_ADMIN_LICENSE="License" COM_ADMIN_LOG_DIRECTORY="(Log folder)" -COM_ADMIN_MAGIC_QUOTES="Magic Quotes" COM_ADMIN_MAX_INPUT_VARS="Maximum Input Variables" COM_ADMIN_MBSTRING_ENABLED="Multibyte String (mbstring) Enabled" -COM_ADMIN_MCRYPT_ENABLED="Mcrypt Enabled" COM_ADMIN_MEDIA_CACHE_DIRECTORY="Cached Media Directory" COM_ADMIN_NA="n/a" COM_ADMIN_OPEN_BASEDIR="Open basedir" @@ -125,16 +120,12 @@ COM_ADMIN_PHP_INFORMATION="PHP Information" COM_ADMIN_PHP_SETTINGS="PHP Settings" COM_ADMIN_PHP_VERSION="PHP Version" COM_ADMIN_PHPINFO_DISABLED="The built in phpinfo() function has been disabled by your host." -COM_ADMIN_PLATFORM_VERSION="Joomla! Platform Version" -COM_ADMIN_RELEVANT_PHP_SETTINGS="Relevant PHP Settings" -COM_ADMIN_SEARCH="Search" COM_ADMIN_SESSION_AUTO_START="Session Auto Start" COM_ADMIN_SESSION_SAVE_PATH="Session Save Path" COM_ADMIN_SETTING="Setting" COM_ADMIN_SHORT_OPEN_TAGS="Short Open Tags" COM_ADMIN_START_HERE="Start here" COM_ADMIN_STATUS="Status" -COM_ADMIN_SYSTEM_INFO="System Info" COM_ADMIN_SYSTEM_INFORMATION="System Information" COM_ADMIN_TEMP_DIRECTORY="(Temp folder)" COM_ADMIN_UNWRITABLE="Unwritable" @@ -147,4 +138,3 @@ COM_ADMIN_XML_DESCRIPTION="Administration system information component." COM_ADMIN_XML_ENABLED="XML Enabled" COM_ADMIN_ZIP_ENABLED="Native ZIP Enabled" COM_ADMIN_ZLIB_ENABLED="Zlib Enabled" - diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index aabe99e0334e3..061515cf550d2 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -121,7 +121,6 @@ JSHOW="Show" JSITE="Site" JSUBMIT="Submit" JTAG="Tags" -JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter." JTAG_FIELD_SELECT_DESC="Select the tag to use." JTOOLBAR="Toolbar" JTRASH="Trash" @@ -171,7 +170,6 @@ JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error" JERROR_LOADFILE_FAILED="Error loading form file" JERROR_LOADING_MENUS="Error loading Menus: %s" JERROR_LOGIN_DENIED="You do not have access to the Administrator section of this site." -JERROR_MAGIC_QUOTES="Your host needs to disable magic_quotes_gpc to run this version of Joomla!" JERROR_NO_ITEMS_SELECTED="No item(s) selected." JERROR_NOLOGIN_BLOCKED="Login denied! Your account has either been blocked or you have not activated it yet." JERROR_SENDING_EMAIL="Email could not be sent." diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.ini b/administrator/language/en-GB/en-GB.plg_user_profile.ini index aede58783926c..9fd6f73d91a02 100644 --- a/administrator/language/en-GB/en-GB.plg_user_profile.ini +++ b/administrator/language/en-GB/en-GB.plg_user_profile.ini @@ -29,5 +29,5 @@ PLG_USER_PROFILE_FILL_FIELD_DESC_SITE="If required, please fill this field." PLG_USER_PROFILE_OPTION_AGREE="Agree" PLG_USER_PROFILE_SLIDER_LABEL="User Profile" ; Adapt the following string to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE' -PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, ie 0000-00-00" +PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, eg 2019-01-27." PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin" diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index b5a657c7e0e59..6c4743ab4037f 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -100,7 +100,6 @@ JSITE="Site" JSTATUS="Status" JSUBMIT="Submit" JTAG="Tags" -JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter." JTAG_FIELD_SELECT_DESC="Select the tag to use." JTOOLBAR="Toolbar" JTOOLBAR_VERSIONS="Versions" diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml index 42d824d89118b..15c904b438b25 100644 --- a/modules/mod_articles_news/mod_articles_news.xml +++ b/modules/mod_articles_news/mod_articles_news.xml @@ -37,7 +37,6 @@ name="tag" type="tag" label="JTAG" - description="JTAG_DESC" mode="nested" multiple="true" filter="int_array" diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php index ae00c0d2b4f58..46c36372717fa 100644 --- a/plugins/system/languagefilter/languagefilter.php +++ b/plugins/system/languagefilter/languagefilter.php @@ -171,8 +171,8 @@ public function onAfterInitialise() $router->attachBuildRule(array($this, 'postprocessNonSEFBuildRule'), Router::PROCESS_AFTER); } - // Attach parse rules for language SEF. - $router->attachParseRule(array($this, 'parseRule'), Router::PROCESS_DURING); + // Attach parse rule. + $router->attachParseRule(array($this, 'parseRule'), Router::PROCESS_BEFORE); } /** diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php index 8831de0e61fea..450db1c7ac901 100644 --- a/tests/Unit/bootstrap.php +++ b/tests/Unit/bootstrap.php @@ -11,9 +11,6 @@ define('_JEXEC', 1); -// Fix magic quotes. -ini_set('magic_quotes_runtime', 0); - // Maximise error reporting. ini_set('zend.ze1_compatibility_mode', '0'); error_reporting(E_ALL);