Merge branch '4.0-dev' into j4/cleanup/plg_system_cache

joomla · Jan 10, 2020 · 2e3ab6f · 2e3ab6f
2 parents 5480304 + e0bf41b
commit 2e3ab6f
Show file tree

Hide file tree

Showing 513 changed files with 5,719 additions and 3,846 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -42,7 +42,7 @@ install:
         }
     - appveyor-retry cinst -y sqlite
     - cd C:\tools\php
-    # Get the MSSQL DLL's
+    # Get the MSSQL DLLs
     - ps: >-
         If ($env:PHP -eq "1") {
             cd c:\tools\php\ext

diff --git a/.drone.yml b/.drone.yml
@@ -171,6 +171,8 @@ steps:
   - name: javascript-cs
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - export DISPLAY=:0
       - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
@@ -181,6 +183,8 @@ steps:
   - name: javascript-tests
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - export DISPLAY=:0
       - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
@@ -191,24 +195,32 @@ steps:
   - name: system-tests-mysql
     depends_on: [ javascript-tests ]
     image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
 
   - name: system-tests-mysql8
     depends_on: [ system-tests-mysql ]
     image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
 
   - name: system-tests-postgres
     depends_on: [ system-tests-mysql8 ]
     image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
 
   - name: api-tests
     depends_on: [ system-tests-postgres ]
     image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-api-run.sh "$(pwd)"
 
@@ -297,6 +309,6 @@ services:
 
 ---
 kind: signature
-hmac: 9269cc571ec30d3d18ba3bb5f7dc132c36608b54ec777ae6d9c6dde224255fc8
+hmac: bf9ea2d23f5b94fc80c2cb5fbd9b8c5f7b1423319c01a904b0b499233eb873f6
 
 ...
diff --git a/administrator/components/com_actionlogs/actionlogs.xml b/administrator/components/com_actionlogs/actionlogs.xml
@@ -27,8 +27,8 @@
 			<folder>View</folder>
 		</files>
 		<languages folder="admin">
-			<language tag="en-GB">language/en-GB.com_actionlogs.ini</language>
-			<language tag="en-GB">language/en-GB.com_actionlogs.sys.ini</language>
+			<language tag="en-GB">language/en-GB/com_actionlogs.ini</language>
+			<language tag="en-GB">language/en-GB/com_actionlogs.sys.ini</language>
 		</languages>
 	</administration>
 </extension>
diff --git a/administrator/components/com_actionlogs/forms/filter_actionlogs.xml b/administrator/components/com_actionlogs/forms/filter_actionlogs.xml
@@ -4,6 +4,7 @@
 		<field
 			name="search"
 			type="text"
+			inputmode="search"
 			label="COM_ACTIONLOGS_FILTER_SEARCH_DESC"
 			description="COM_ACTIONLOGS_SEARCH_IN_NAME"
 			hint="JSEARCH_FILTER"

diff --git a/administrator/components/com_admin/admin.xml b/administrator/components/com_admin/admin.xml
@@ -27,8 +27,8 @@
 			<folder>View</folder>
 		</files>
 		<languages folder="admin">
-			<language tag="en-GB">language/en-GB.com_admin.ini</language>
-			<language tag="en-GB">language/en-GB.com_admin.sys.ini</language>
+			<language tag="en-GB">language/en-GB/com_admin.ini</language>
+			<language tag="en-GB">language/en-GB/com_admin.sys.ini</language>
 		</languages>
 	</administration>
 </extension>
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-01.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-01.sql
@@ -3,6 +3,10 @@ ALTER TABLE `#__ucm_content` MODIFY `core_modified_time` datetime NOT NULL;
 
 ALTER TABLE `#__ucm_content` MODIFY `core_publish_up` datetime NULL DEFAULT NULL;
 ALTER TABLE `#__ucm_content` MODIFY `core_publish_down` datetime NULL DEFAULT NULL;
+
+-- Only on MySQL: Update empty strings to null date before converting the column from varchar to datetime
+UPDATE `#__ucm_content` SET `core_checked_out_time` = '0000-00-00 00:00:00' WHERE `core_checked_out_time` = '';
+
 ALTER TABLE `#__ucm_content` MODIFY `core_checked_out_time` datetime NULL DEFAULT NULL;
 
 ALTER TABLE `#__ucm_history` MODIFY `save_date` datetime NOT NULL;
diff --git a/administrator/components/com_ajax/ajax.xml b/administrator/components/com_ajax/ajax.xml
@@ -13,15 +13,15 @@
 		<filename>ajax.php</filename>
 	</files>
 	<languages folder="site">
-		<language tag="en-GB">language/en-GB.com_ajax.ini</language>
+		<language tag="en-GB">language/en-GB/com_ajax.ini</language>
 	</languages>
 	<administration>
 		<files folder="admin">
 			<filename>ajax.php</filename>
 		</files>
 		<languages folder="admin">
-			<language tag="en-GB">language/en-GB.com_ajax.ini</language>
-			<language tag="en-GB">language/en-GB.com_ajax.sys.ini</language>
+			<language tag="en-GB">language/en-GB/com_ajax.ini</language>
+			<language tag="en-GB">language/en-GB/com_ajax.sys.ini</language>
 		</languages>
 	</administration>
 </extension>
diff --git a/administrator/components/com_associations/Field/ItemlanguageField.php b/administrator/components/com_associations/Field/ItemlanguageField.php
@@ -60,7 +60,7 @@ protected function getOptions()
 		$canCreate = AssociationsHelper::allowAdd($extensionName, $typeName);
 
 		// Gets existing languages.
-		$existingLanguages = LanguageHelper::getContentLanguages(array(0, 1));
+		$existingLanguages = LanguageHelper::getContentLanguages(array(0, 1), false);
 
 		$options = array();
 

diff --git a/administrator/components/com_associations/Field/Modal/AssociationField.php b/administrator/components/com_associations/Field/Modal/AssociationField.php
@@ -45,8 +45,8 @@ protected function getInput()
 		// The active item id field.
 		$value = (int) $this->value > 0 ? (int) $this->value : '';
 
-		Factory::getDocument()->addScriptOptions('modal-associations', ['itemId' => $value]);
-		HTMLHelper::_('script', 'com_associations/modal-associations.min.js', ['version' => 'auto', 'relative' => true]);
+		Factory::getDocument()->addScriptOptions('admin_associations_modal', ['itemId' => $value]);
+		HTMLHelper::_('script', 'com_associations/admin_associations_modal.min.js', ['version' => 'auto', 'relative' => true]);
 
 		// Setup variables for display.
 		$html = array();

diff --git a/administrator/components/com_associations/Helper/AssociationsHelper.php b/administrator/components/com_associations/Helper/AssociationsHelper.php
@@ -19,6 +19,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 
 /**
@@ -222,7 +223,17 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 		$titleFieldName = self::getTypeFieldName($extensionName, $typeName, 'title');
 
 		// Get all content languages.
-		$languages = LanguageHelper::getContentLanguages(array(0, 1));
+		$languages = LanguageHelper::getContentLanguages(array(0, 1), false);
+		$content_languages = array_column($languages, 'lang_code');
+
+		// Display warning if Content Language is trashed or deleted
+		foreach ($items as $item)
+		{
+			if (!in_array($item['language'], $content_languages))
+			{
+				Factory::getApplication()->enqueueMessage(Text::sprintf('JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING', $item['language']), 'warning');
+			}
+		}
 
 		$canEditReference = self::allowEdit($extensionName, $typeName, $itemId);
 		$canCreate        = self::allowAdd($extensionName, $typeName);
@@ -263,12 +274,13 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 					$query = $db->getQuery(true)
 						->select($db->quoteName('title'))
 						->from($db->quoteName('#__categories'))
-						->where($db->quoteName('id') . ' = ' . $db->quote($items[$langCode]['catid']));
+						->where($db->quoteName('id') . ' = :id')
+						->bind(':id', $items[$langCode]['catid'], ParameterType::INTEGER);
 
 					$db->setQuery($query);
-					$category_title = $db->loadResult();
+					$categoryTitle = $db->loadResult();
 
-					$additional = '<strong>' . Text::sprintf('JCATEGORY_SPRINTF', $category_title) . '</strong> <br>';
+					$additional = '<strong>' . Text::sprintf('JCATEGORY_SPRINTF', $categoryTitle) . '</strong> <br>';
 				}
 				elseif (isset($items[$langCode]['menutype']))
 				{
@@ -278,12 +290,13 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 					$query = $db->getQuery(true)
 						->select($db->quoteName('title'))
 						->from($db->quoteName('#__menu_types'))
-						->where($db->quoteName('menutype') . ' = ' . $db->quote($items[$langCode]['menutype']));
+						->where($db->quoteName('menutype') . ' = :menutype')
+						->bind(':menutype', $items[$langCode]['menutype']);
 
 					$db->setQuery($query);
-					$menutype_title = $db->loadResult();
+					$menutypeTitle = $db->loadResult();
 
-					$additional = '<strong>' . Text::sprintf('COM_MENUS_MENU_SPRINTF', $menutype_title) . '</strong><br>';
+					$additional = '<strong>' . Text::sprintf('COM_MENUS_MENU_SPRINTF', $menutypeTitle) . '</strong><br>';
 				}
 
 				$labelClass  = 'badge-secondary';