Enable caching of menu data in JMenuSite (#10797)

* Enable caching of menu data in JMenuSite * Use a lambda function for the query instead
joomla · Sep 6, 2016 · d41e779 · d41e779
1 parent d6dcc76
commit d41e779
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php
@@ -1685,6 +1685,7 @@ protected function generateNewTitle($parent_id, $alias, $title)
 	 */
 	protected function cleanCache($group = null, $client_id = 0)
 	{
+		parent::cleanCache('com_menus', 0);
 		parent::cleanCache('com_modules');
 		parent::cleanCache('mod_menu');
 	}

diff --git a/administrator/components/com_menus/models/menu.php b/administrator/components/com_menus/models/menu.php
@@ -351,6 +351,7 @@ public function &getModules()
 	 */
 	protected function cleanCache($group = null, $client_id = 0)
 	{
+		parent::cleanCache('com_menus', 0);
 		parent::cleanCache('com_modules');
 		parent::cleanCache('mod_menu');
 	}

diff --git a/libraries/cms/menu/site.php b/libraries/cms/menu/site.php
@@ -66,24 +66,37 @@ public function __construct($options = array())
 	 */
 	public function load()
 	{
-		$db    = $this->db;
-		$query = $db->getQuery(true)
-			->select('m.id, m.menutype, m.title, m.alias, m.note, m.path AS route, m.link, m.type, m.level, m.language')
-			->select($db->quoteName('m.browserNav') . ', m.access, m.params, m.home, m.img, m.template_style_id, m.component_id, m.parent_id')
-			->select('e.element as component')
-			->from('#__menu AS m')
-			->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
-			->where('m.published = 1')
-			->where('m.parent_id > 0')
-			->where('m.client_id = 0')
-			->order('m.lft');
-
-		// Set the query
-		$db->setQuery($query);
+		// For PHP 5.3 compat we can't use $this in the lambda function below
+		$db = $this->db;
 
 		try
 		{
-			$this->_items = $db->loadObjectList('id');
+			/** @var JCacheControllerCallback $cache */
+			$cache = JFactory::getCache('com_menus', 'callback');
+
+			$this->_items = $cache->get(
+				function () use ($db)
+				{
+					$query = $db->getQuery(true)
+						->select('m.id, m.menutype, m.title, m.alias, m.note, m.path AS route, m.link, m.type, m.level, m.language')
+						->select($db->quoteName('m.browserNav') . ', m.access, m.params, m.home, m.img, m.template_style_id, m.component_id, m.parent_id')
+						->select('e.element as component')
+						->from('#__menu AS m')
+						->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
+						->where('m.published = 1')
+						->where('m.parent_id > 0')
+						->where('m.client_id = 0')
+						->order('m.lft');
+
+					// Set the query
+					$db->setQuery($query);
+
+					return $db->loadObjectList('id');
+				},
+				array(),
+				md5(get_class($this)),
+				false
+			);
 		}
 		catch (RuntimeException $e)
 		{