cs

joomla · Feb 27, 2016 · 57d952b · 57d952b
1 parent 1fd8cb2
commit 57d952b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/administrator/components/com_modules/models/modules.php b/administrator/components/com_modules/models/modules.php
@@ -273,23 +273,23 @@ protected function getListQuery()
 		// Join over the language
 		$query->select($db->quoteName('l.title', 'language_title'))
 			->select($db->quoteName('l.image', 'language_image'))
-			->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->quoteName('l.lang_code') . ' = '. $db->quoteName('a.language'));
+			->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->quoteName('l.lang_code') . ' = ' . $db->quoteName('a.language'));
 
 		// Join over the users for the checked out user.
 		$query->select($db->quoteName('uc.name', 'editor'))
-			->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON ' . $db->quoteName('uc.id') . ' = '. $db->quoteName('a.checked_out'));
+			->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON ' . $db->quoteName('uc.id') . ' = ' . $db->quoteName('a.checked_out'));
 
 		// Join over the asset groups.
 		$query->select($db->quoteName('ag.title', 'access_level'))
-			->join('LEFT', $db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->quoteName('ag.id') . ' = '. $db->quoteName('a.access'));
+			->join('LEFT', $db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->quoteName('ag.id') . ' = ' . $db->quoteName('a.access'));
 
 		// Join over the module menus
 		$query->select('MIN(mm.menuid) AS pages')
-			->join('LEFT', $db->quoteName('#__modules_menu', 'mm') . ' ON ' . $db->quoteName('mm.moduleid') . ' = '. $db->quoteName('a.id'));
+			->join('LEFT', $db->quoteName('#__modules_menu', 'mm') . ' ON ' . $db->quoteName('mm.moduleid') . ' = ' . $db->quoteName('a.id'));
 
 		// Join over the extensions
 		$query->select($db->quoteName('e.name', 'name'))
-			->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON ' . $db->quoteName('e.element') . ' = '. $db->quoteName('a.module'));
+			->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON ' . $db->quoteName('e.element') . ' = ' . $db->quoteName('a.module'));
 
 		// Group (careful with PostgreSQL)
 		$query->group(

diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php
@@ -77,22 +77,17 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
+		$clientText = ((int) $this->state->get('filter.client_id') === 1) ) JText::_('JADMINISTRATOR') : JText::_('JSITE');
+
+		JToolbarHelper::title(JText::sprintf('COM_MODULES_MANAGER_MODULES_TITLE', $clientText), 'cube module');
+
 		$state = $this->get('State');
 		$canDo = JHelperContent::getActions('com_modules');
 		$user  = JFactory::getUser();
 
 		// Get the toolbar object instance
 		$bar = JToolbar::getInstance('toolbar');
 
-		if ($state->get('client_id') == 1)
-		{
-			JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES_ADMIN'), 'cube module');
-		}
-		else
-		{
-			JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES_SITE'), 'cube module');
-		}
-
 		if ($canDo->get('core.create'))
 		{
 			// Instantiate a new JLayoutFile instance and render the layout