Merge branch '4.0-dev' into switcher-label

joomla · Dec 6, 2019 · 79e195c · 79e195c
2 parents 7af9434 + f794274
commit 79e195c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 58 deletions.
diff --git a/administrator/components/com_menus/Controller/ItemController.php b/administrator/components/com_menus/Controller/ItemController.php
@@ -401,7 +401,6 @@ public function save($key = null, $urlVar = null)
 			}
 
 			$data['link'] = 'index.php?' . urldecode(http_build_query($args, '', '&'));
-			unset($data['request']);
 		}
 
 		// Check for validation errors.

diff --git a/administrator/components/com_menus/Controller/MenusController.php b/administrator/components/com_menus/Controller/MenusController.php
@@ -198,10 +198,6 @@ public function resync()
 			return;
 		}
 
-		// Declare variables before binding.
-		$componentId = 0;
-		$itemId      = 0;
-
 		$query = $db->getQuery(true)
 			->update($db->quoteName('#__menu'))
 			->set($db->quoteName('component_id') . ' = :componentId')

diff --git a/administrator/components/com_menus/Model/ItemModel.php b/administrator/components/com_menus/Model/ItemModel.php
@@ -1381,10 +1381,6 @@ public function rebuild()
 			return false;
 		}
 
-		// Declare paramaters before binding.
-		$id     = 0;
-		$params = '';
-
 		$query = $db->getQuery(true)
 			->update($db->quoteName('#__menu'))
 			->set($db->quoteName('params') . ' = :params')

diff --git a/administrator/components/com_menus/Model/MenusModel.php b/administrator/components/com_menus/Model/MenusModel.php
@@ -80,7 +80,6 @@ public function getItems()
 		$db = $this->getDbo();
 		$menuTypes = array_column((array) $items, 'menutype');
 
-		// Get the published menu counts.
 		$query = $db->getQuery(true)
 			->select(
 				[
@@ -89,14 +88,17 @@ public function getItems()
 				]
 			)
 			->from($db->quoteName('#__menu', 'm'))
-			->where($db->quoteName('m.published') . ' = 1')
+			->where($db->quoteName('m.published') . ' = :published')
 			->whereIn($db->quoteName('m.menutype'), $menuTypes, ParameterType::STRING)
-			->group($db->quoteName('m.menutype'));
+			->group($db->quoteName('m.menutype'))
+			->bind(':published', $published, ParameterType::INTEGER);
 
 		$db->setQuery($query);
 
+		// Get the published menu counts.
 		try
 		{
+			$published      = 1;
 			$countPublished = $db->loadAssocList('menutype', 'count_published');
 		}
 		catch (\RuntimeException $e)
@@ -107,14 +109,9 @@ public function getItems()
 		}
 
 		// Get the unpublished menu counts.
-		$query->clear('where')
-			->bind()
-			->where($db->quoteName('m.published') . ' = 0')
-			->whereIn($db->quoteName('m.menutype'), $menuTypes, ParameterType::STRING);
-		$db->setQuery($query);
-
 		try
 		{
+			$published        = 0;
 			$countUnpublished = $db->loadAssocList('menutype', 'count_published');
 		}
 		catch (\RuntimeException $e)
@@ -125,14 +122,9 @@ public function getItems()
 		}
 
 		// Get the trashed menu counts.
-		$query->clear('where')
-			->bind()
-			->where($db->quoteName('m.published') . ' = -2')
-			->whereIn($db->quoteName('m.menutype'), $menuTypes, ParameterType::STRING);
-		$db->setQuery($query);
-
 		try
 		{
+			$published    = -2;
 			$countTrashed = $db->loadAssocList('menutype', 'count_published');
 		}
 		catch (\RuntimeException $e)

diff --git a/composer.lock b/composer.lock
diff --git a/libraries/src/Installer/Adapter/LanguageAdapter.php b/libraries/src/Installer/Adapter/LanguageAdapter.php
@@ -124,10 +124,6 @@ protected function finaliseUninstall(): bool
 
 		$count = 0;
 
-		// Declare parameters before binding.
-		$userId   = 0;
-		$registry = '';
-
 		// Prepare the query.
 		$query = $db->getQuery(true)
 			->update($db->quoteName('#__users'))