Merge with upstream branch

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;
 				}
 			}
 

administrator/language/en-GB/plg_sampledata_blog.ini

@@ -21,30 +21,26 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_TITLE="About your home page"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. </p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT="<p>These include:</p><ul><li>Image Module which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Most Read Posts which lists articles based on the number of times they have been read.</li><li>Older Articles which lists out articles by month.</li><li>Syndicate which allows your readers to read your posts in a news reader.</li><li>Popular Tags, which will appear if you use tagging on your articles. Enter a tag in the Tags field when editing.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. Moving your mouse over a module and selecting the edit icon will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more module that you can find at the <a href='https://extensions.joomla.org/'>Joomla Extensions Directory.</a></p>"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website. This blog is installed with the Cassiopeia template.</p><p>You can edit the options by selecting the Working on Your Site, Template Settings link in the top menu (visible when you login).</p><p>For example you can change the site background color, highlights color, site title, site description and title font used.<br>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT="<p>This blog is installed with the Cassiopeia template.</p><p>You can edit the options by selecting the Working on Your Site, Template Settings link in the top menu (visible when you login).</p><p>For example you can change the site background color, highlights color, site title, site description and title font used.</p><p>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_TITLE="Your Template"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_FULLTEXT=" This will be a nice documentation on multi column Layouts in J4. <br><br>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est "
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_INTROTEXT="<p>Millions of Websites are built on Joomla!</p>"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_TITLE="Multilingual"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_FULLTEXT="Uurnip greens yarrow ricebean rutabaga endive cauliflower sea lettuce kohlrabi amaranth water spinach avocado daikon napa cabbage asparagus winter purslane kale. Celery potato scallion desert raisin horseradish spinach carrot soko. Lotus root water spinach fennel kombu maize bamboo shoot green bean swiss chard seakale pumpkin onion chickpea gram corn pea. Brussels sprout coriander water chestnut gourd swiss chard wakame kohlrabi beetroot carrot watercress. Corn amaranth salsify bunya nuts nori azuki bean chickweed potato bell pepper artichoke. "
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_INTROTEXT="<p>We love Joomla to the moon and back! Thank you to all voluteers who have contributed!</p> "
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_TITLE="Flexible System"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_TITLE="Millions"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_FULLTEXT="<p>Uurnip greens yarrow ricebean rutabaga endive cauliflower sea lettuce kohlrabi amaranth water spinach avocado daikon napa cabbage asparagus winter purslane kale. Celery potato scallion desert raisin horseradish spinach carrot soko. Lotus root water spinach fennel kombu maize bamboo shoot green bean swiss chard seakale pumpkin onion chickpea gram corn pea. Brussels sprout coriander water chestnut gourd swiss chard wakame kohlrabi beetroot carrot watercress. Corn amaranth salsify bunya nuts nori azuki bean chickweed potato bell pepper artichoke.</p> "
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_INTROTEXT="<p>We love Joomla to the moon and back! Thank you to all volunteers who have contributed!</p> "
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_TITLE="Love"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_FULLTEXT="<p>Cupcake ipsum dolor. Sit amet cotton candy ice cream sesame snaps cake marshmallow powder. Ice cream chocolate cake marshmallow halvah bonbon. Dragée carrot cake danish candy muffin brownie. Candy sugar plum ice cream chupa chups macaroon tiramisu soufflé oat cake. Topping cheesecake lollipop gummi bears icing sweet roll donut liquorice. Pie jelly-o candy donut oat cake cotton candy. </p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_INTROTEXT="<p>We proudly present Joomla Version 4!</p>"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_TITLE="Security First!"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_TITLE="Joomla"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE="Blog"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE="Help"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_2_TITLE="Template"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_2_TITLE="Joomla"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE="Blog"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE="Template Settings"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_11_TITLE="Template"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_11_TITLE="Sample Layouts"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_12_TITLE="Category List"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_14_TITLE="Article"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_15_TITLE="Archive"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_16_TITLE="Articles"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_17_TITLE="Lorem"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_18_TITLE="Ipsum"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_13_TITLE="Articles"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE="About"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE="Author Login"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE="Create a Post"

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 {

build/media_source/plg_system_debug/widgets/sqlqueries/widget.css

@@ -100,26 +100,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 +135,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 {