Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev

joomla · Oct 1, 2020 · 3fa77ab · 3fa77ab
2 parents 85b4d78 + e45709c
commit 3fa77ab
Show file tree

Hide file tree

Showing 87 changed files with 887 additions and 979 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-04-18.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-04-18.sql
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-09-27.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-09-27.sql
@@ -0,0 +1 @@
+DELETE FROM `#__extensions` WHERE `name` = 'plg_content_imagelazyload' AND `type` = 'plugin' AND `element` = 'imagelazyload' AND `folder` = 'content' AND `client_id` = 0;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-04-18.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-04-18.sql
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-09-27.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-09-27.sql
@@ -0,0 +1 @@
+DELETE FROM "#__extensions" WHERE "name" = 'plg_content_imagelazyload' AND "type" = 'plugin' AND "element" = 'imagelazyload' AND "folder" = 'content' AND "client_id" = 0;
diff --git a/administrator/components/com_checkin/src/Model/CheckinModel.php b/administrator/components/com_checkin/src/Model/CheckinModel.php
@@ -107,26 +107,31 @@ public function checkin($ids = array())
 				continue;
 			}
 
+			$query = $db->getQuery(true)
+				->update($db->quoteName($tn))
+				->set($db->quoteName('checked_out') . ' = DEFAULT');
+
 			if ($fields['checked_out_time']->Null === 'YES')
 			{
-				$query = $db->getQuery(true)
-					->update($db->quoteName($tn))
-					->set($db->quoteName('checked_out') . ' = DEFAULT')
-					->set($db->quoteName('checked_out_time') . ' = NULL')
-					->where($db->quoteName('checked_out') . ' > 0');
+				$query->set($db->quoteName('checked_out_time') . ' = NULL');
 			}
 			else
 			{
 				$nullDate = $db->getNullDate();
 
-				$query = $db->getQuery(true)
-					->update($db->quoteName($tn))
-					->set($db->quoteName('checked_out') . ' = DEFAULT')
-					->set($db->quoteName('checked_out_time') . ' = :checkouttime')
-					->where($db->quoteName('checked_out') . ' > 0')
+				$query->set($db->quoteName('checked_out_time') . ' = :checkouttime')
 					->bind(':checkouttime', $nullDate);
 			}
 
+			if ($fields['checked_out']->Null === 'YES')
+			{
+				$query->where($db->quoteName('checked_out') . ' IS NOT NULL');
+			}
+			else
+			{
+				$query->where($db->quoteName('checked_out') . ' > 0');
+			}
+
 			$db->setQuery($query);
 
 			if ($db->execute())
@@ -169,56 +174,50 @@ public function getItems()
 		{
 			$db     = $this->getDbo();
 			$tables = $db->getTableList();
+			$prefix = Factory::getApplication()->get('dbprefix');
 
 			// This array will hold table name as key and checked in item count as value.
 			$results = array();
 
-			foreach ($tables as $i => $tn)
+			foreach ($tables as $tn)
 			{
 				// Make sure we get the right tables based on prefix.
-				if (stripos($tn, Factory::getApplication()->get('dbprefix')) !== 0)
+				if (stripos($tn, $prefix) !== 0)
 				{
-					unset($tables[$i]);
 					continue;
 				}
 
 				if ($this->getState('filter.search') && stripos($tn, $this->getState('filter.search')) === false)
 				{
-					unset($tables[$i]);
 					continue;
 				}
 
-				$fields = $db->getTableColumns($tn);
+				$fields = $db->getTableColumns($tn, false);
 
 				if (!(isset($fields['checked_out']) && isset($fields['checked_out_time'])))
 				{
-					unset($tables[$i]);
 					continue;
 				}
-			}
 
-			foreach ($tables as $tn)
-			{
 				$query = $db->getQuery(true)
 					->select('COUNT(*)')
-					->from($db->quoteName($tn))
-					->where('checked_out > 0');
-
-				$db->setQuery($query);
+					->from($db->quoteName($tn));
 
-				if ($db->execute())
+				if ($fields['checked_out']->Null === 'YES')
 				{
-					$results[$tn] = $db->loadResult();
-
-					// Show only tables with items to checkin.
-					if ((int) $results[$tn] === 0)
-					{
-						unset($results[$tn]);
-					}
+					$query->where($db->quoteName('checked_out') . ' IS NOT NULL');
 				}
 				else
 				{
-					continue;
+					$query->where($db->quoteName('checked_out') . ' > 0');
+				}
+
+				$db->setQuery($query);
+				$count = $db->loadResult();
+
+				if ($count)
+				{
+					$results[$tn] = $count;
 				}
 			}
 

diff --git a/administrator/language/en-GB/com_actionlogs.ini b/administrator/language/en-GB/com_actionlogs.ini
@@ -35,7 +35,7 @@ COM_ACTIONLOGS_IP_ADDRESS_DESC="IP Address descending"
 COM_ACTIONLOGS_IP_INVALID="Invalid IP"
 COM_ACTIONLOGS_IP_LOGGING_LABEL="IP Logging"
 COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL="Events To Log"
-COM_ACTIONLOGS_LOG_VERBS_LABEL="Verbs To Log"
+COM_ACTIONLOGS_LOG_VERBS_LABEL="Request Methods To Log"
 COM_ACTIONLOGS_MANAGER_USERLOGS="User Actions Log"
 COM_ACTIONLOGS_N_ITEMS_DELETED="%s logs deleted."
 COM_ACTIONLOGS_N_ITEMS_DELETED_1="Log deleted."

diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
@@ -433,10 +433,10 @@ JLIB_HTML_BATCH_COPY="Copy"
 JLIB_HTML_BATCH_FLIPORDERING_LABEL="Reverse the ordering of all articles in the selected categories"
 JLIB_HTML_BATCH_LANGUAGE_LABEL="Set Language"
 JLIB_HTML_BATCH_LANGUAGE_NOCHANGE="- Keep original Language -"
-JLIB_HTML_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category."
+JLIB_HTML_BATCH_MENU_LABEL="Copy or Move to Category"
 JLIB_HTML_BATCH_MOVE="Move"
-JLIB_HTML_BATCH_MOVE_QUESTION="Do you want to move the items or make a copy of them?"
-JLIB_HTML_BATCH_NO_CATEGORY="- Don't move or copy -"
+JLIB_HTML_BATCH_MOVE_QUESTION="Action to Perform"
+JLIB_HTML_BATCH_NO_CATEGORY="- Don't copy or move -"
 JLIB_HTML_BATCH_NOCHANGE="- Keep original Access Levels -"
 JLIB_HTML_BATCH_TAG_LABEL="Add Tag"
 JLIB_HTML_BATCH_TAG_NOCHANGE="- Keep original Tags -"

diff --git a/administrator/language/en-GB/plg_content_imagelazyload.sys.ini b/administrator/language/en-GB/plg_content_imagelazyload.sys.ini
diff --git a/administrator/templates/atum/scss/vendor/choicesjs/choices.scss b/administrator/templates/atum/scss/vendor/choicesjs/choices.scss
@@ -137,6 +137,35 @@
     justify-content: space-between;
   }
 
+  .choices__button_joomla {
+    position: absolute;
+    top: 50%;
+    right: 0;
+    width: 20px;
+    height: 20px;
+    padding: 0;
+    margin-top: -10px;
+    margin-right: 50px;
+    border-radius: 10em;
+    opacity: .5;
+
+    [dir=rtl] & {
+      right: auto;
+      left: 0;
+      margin-right: 0;
+      margin-left: 50px;
+    }
+
+    &:hover,
+    &:focus {
+      opacity: 1;
+    }
+
+    &:focus {
+      box-shadow: 0 0 0 2px #00bcd4;
+    }
+  }
+
   &::after {
     display: none;
   }

diff --git a/build/media_source/com_media/js/edit-images.es6.js b/build/media_source/com_media/js/edit-images.es6.js
@@ -157,8 +157,15 @@ Joomla.MediaManager = Joomla.MediaManager || {};
         Joomla.MediaManager.Edit.Reset(true);
         break;
       case 'save':
-        Joomla.UploadFile.exec(name, JSON.stringify(forUpload), uploadPath, url, type);
-        window.location = `${pathName}?option=com_media&view=media&path=${fileDirectory}`;
+        Joomla.UploadFile.exec(name, JSON.stringify(forUpload), uploadPath, url, type, function () {
+          if (this.readyState === XMLHttpRequest.DONE) {
+            if (window.self !== window.top) {
+              window.location = `${pathName}?option=com_media&view=media&path=${fileDirectory}&tmpl=component`;
+            } else {
+              window.location = `${pathName}?option=com_media&view=media&path=${fileDirectory}`;
+            }
+          }
+        });
         break;
       case 'cancel':
         if (window.self !== window.top) {
@@ -190,13 +197,17 @@ Joomla.MediaManager = Joomla.MediaManager || {};
   /**
    * @TODO Extend Joomla.request and drop this code!!!!
    */
-  Joomla.UploadFile.exec = (name, data, uploadPath, url, type) => {
+  Joomla.UploadFile.exec = (name, data, uploadPath, url, type, stateChangeCallback) => {
     const xhr = new XMLHttpRequest();
 
     xhr.upload.onprogress = (e) => {
       Joomla.MediaManager.Edit.updateProgressBar((e.loaded / e.total) * 100);
     };
 
+    if (typeof stateChangeCallback === 'function') {
+      xhr.onreadystatechange = stateChangeCallback;
+    }
+
     xhr.onload = () => {
       let resp;
       try {

diff --git a/build/media_source/mod_articles_news/css/template.css b/build/media_source/mod_articles_news/css/template.css
@@ -23,7 +23,7 @@
   .mod-articlesnews-horizontal {
     display: grid;
     grid-gap: 2rem;
-    grid-template-columns: repeat(auto-fit, minmax(330px, 1fr));
+    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
   }
   .mod-articlesnews-horizontal li:not(:last-child) {
     margin-right: 0;

diff --git a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css
@@ -49,9 +49,10 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye:before,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye-dash:before,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before,
 div.phpdebugbar-widgets-sqlqueries a.phpdebugbar-widgets-editor-link:before {
-    font-family:"Font Awesome 5 Free";
+    font-family: "Font Awesome 5 Free";
     margin-right: 4px;
     font-size: 12px;
+    font-weight: 900;
 }
 
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before {
@@ -100,26 +101,28 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye-dash {
 div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params {
     display: none;
     width: 70%;
-    margin: 10px;
+    margin: 10px 0;
     border: 1px solid #ddd;
     font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
     border-collapse: collapse;
 }
 
-div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params td {
+div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params td,
+div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-explain td {
     border: 1px solid #ddd;
-    text-align: center;
+    padding: 3px;
 }
 
 div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params .phpdebugbar-widgets-name {
     width: 20%;
     font-weight: bold;
 }
 
-div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-callstack {
+div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-callstack,
+div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-explain{
     display: none;
     width: 100%;
-    margin: 10px;
+    margin: 10px 0;
     border: 1px solid #ddd;
     font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
     border-collapse: collapse;
@@ -133,8 +136,11 @@ div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-callstack tbody tr:
     background-color: #eee;
 }
 
-div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-callstack th {
+div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-callstack th,
+div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-explain th,
+div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params th{
     font-weight: bold;
+    padding: 3px;
 }
 
 div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item {