Merge branch '4.1-dev' into j4/server/timing

joomla · Jan 22, 2022 · 976ce29 · 976ce29
2 parents 27300cf + 6185157
commit 976ce29
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 65 deletions.
diff --git a/build/media_source/plg_installer_webinstaller/scss/client.scss b/build/media_source/plg_installer_webinstaller/scss/client.scss
@@ -20,6 +20,19 @@ $extension-types: (
   // Extension type badges
   .badge {
     margin: 1px;
+    // BS5 Dropped all .badge-* color classes
+    &.badge-success {
+      background-color: var(--success);
+    }
+    &.badge-secondary {
+      background-color: var(--secondary);
+    }
+    &.badge-danger {
+      background-color: var(--danger);
+    }
+    &.badge-warning {
+      background-color: var(--warning);
+    }
   }
 
   .fader {
@@ -57,7 +70,7 @@ $extension-types: (
       margin-bottom: 2rem;
 
       &:hover {
-        background-color: $white;
+        background-color: var(--gray-200);
       }
     }
 
@@ -111,58 +124,23 @@ $extension-types: (
   .form-row {
     display: flex;
     .col-md:first-child {
-      margin-right: .8rem;
+      margin-inline-end: .8rem;
     }
 
     .input-group {
-      > input#com-apps-searchbox {
-        border-top-left-radius: .25rem;
-        border-bottom-left-radius: .25rem;
-      }
-
       .input-group-append {
         button#search-extensions {
-          color: var(--template-text-light);
-          background-color: var(--template-link-color);
-          border-color: var(--template-link-color);
-          border-top-left-radius: 0;
-          border-bottom-left-radius: 0;
+          border-start-start-radius: 0;
+          border-end-start-radius: 0;
         }
 
         button#search-reset {
           margin-inline-start: .8rem;
-          background-color: var(--template-bg-dark);
-          border-radius: .25rem;
-        }
-      }
-    }
-  }
-}
-
-/* stylelint-disable selector-max-compound-selectors */
-html[dir=rtl] .com-apps-container {
-  .form-row {
-    .col-md:first-child {
-      margin-left: .8rem;
-    }
-    .input-group {
-      > input#com-apps-searchbox {
-        border-top-right-radius: .25rem;
-        border-bottom-right-radius: .25rem;
-      }
-
-      .input-group-append {
-        button#search-extensions {
-          border-top-left-radius: .25rem;
-          border-top-right-radius: 0;
-          border-bottom-right-radius: 0;
-          border-bottom-left-radius: .25rem;
         }
       }
     }
   }
 }
-/* stylelint-enable selector-max-compound-selectors */
 
 // Disallow scrolling when overlay is active
 .ifw-busy {

diff --git a/composer.lock b/composer.lock
diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php
@@ -547,13 +547,6 @@ public function delete($pk = null, $children = true)
 		);
 		$this->getDispatcher()->dispatch('onBeforeDelete', $event);
 
-		// Lock the table for writing.
-		if (!$this->_lock())
-		{
-			// Error message set in lock method.
-			return false;
-		}
-
 		// If tracking assets, remove the asset first.
 		if ($this->_trackAssets)
 		{
@@ -562,35 +555,31 @@ public function delete($pk = null, $children = true)
 			/** @var Asset $asset */
 			$asset = Table::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));
 
-			// Lock the table for writing.
-			if (!$asset->_lock())
-			{
-				// Error message set in lock method.
-				return false;
-			}
-
 			if ($asset->loadByName($name))
 			{
 				// Delete the node in assets table.
 				if (!$asset->delete(null, $children))
 				{
 					$this->setError($asset->getError());
-					$asset->_unlock();
 
 					return false;
 				}
-
-				$asset->_unlock();
 			}
 			else
 			{
 				$this->setError($asset->getError());
-				$asset->_unlock();
 
 				return false;
 			}
 		}
 
+		// Lock the table for writing.
+		if (!$this->_lock())
+		{
+			// Error message set in lock method.
+			return false;
+		}
+
 		// Get the node by id.
 		$node = $this->_getNode($pk);