Merge branch 'hotfix/j32'

joomlatools · Nov 21, 2013 · 1cb153e · 1cb153e
2 parents 5c5ce4b + fbd70c2
commit 1cb153e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/code/administrator/components/com_default/controllers/behaviors/commandable.php b/code/administrator/components/com_default/controllers/behaviors/commandable.php
@@ -149,7 +149,10 @@ public function _afterGet(KCommandContext $context)
             }
             else $title = false;
 
-            $document->setBuffer($title, 'modules', 'title');
+            // We directly push it to Joomla in template helpers in 3.0+
+            if (version_compare(JVERSION, '3.0', 'lt')) {
+                $document->setBuffer($title, 'modules', 'title');
+            }
 
             //Render the menubar
             if(in_array('menubar', $this->_render))

diff --git a/code/administrator/components/com_default/templates/helpers/toolbar.php b/code/administrator/components/com_default/templates/helpers/toolbar.php
@@ -31,17 +31,30 @@ public function title($config = array())
         ));
 
         $title = $this->translate($config->toolbar->getTitle());
-        
+
         if (version_compare(JVERSION, '3.0', 'ge'))
         {
-            // Strip the extension.
-            $icons = explode(' ', $config->toolbar->getIcon());
-            foreach ($icons as &$icon)
+            if (version_compare(JVERSION, '3.2', 'ge'))
             {
-                $icon = 'icon-48-' . preg_replace('#\.[^.]*$#', '', $icon);
+                // Strip the extension.
+                $icons = explode(' ', $config->toolbar->getIcon());
+                foreach ($icons as &$icon) {
+                    $icon = preg_replace('#\.[^.]*$#', '', $icon);
+                }
+
+                $layout = new JLayoutFile('joomla.toolbar.title');
+                $html = $layout->render(array('title' => $title, 'icon' => $icon));
             }
+            else
+            {
+                // Strip the extension.
+                $icons = explode(' ', $config->toolbar->getIcon());
+                foreach ($icons as &$icon) {
+                    $icon = 'icon-48-' . preg_replace('#\.[^.]*$#', '', $icon);
+                }
 
-            $html = '<div class="pagetitle ' . htmlspecialchars(implode(' ', $icons)) . '"><h2>' . $title . '</h2></div>';
+                $html = '<div class="pagetitle ' . htmlspecialchars(implode(' ', $icons)) . '"><h2>' . $title . '</h2></div>';
+            }
 
             $app = JFactory::getApplication();
             $app->JComponentTitle = $html;

diff --git a/code/plugins/system/koowa.xml b/code/plugins/system/koowa.xml
@@ -7,7 +7,7 @@
     <license>GNU GPLv3 - http://www.gnu.org/licenses/gpl.html</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>www.joomlatools.com</authorUrl>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
     <description></description>
 
     <!--  Files -->

diff --git a/code/plugins/system/manifest.xml b/code/plugins/system/manifest.xml
@@ -7,7 +7,7 @@
     <license>GNU GPLv3 - http://www.gnu.org/licenses/gpl.html</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>www.joomlatools.com</authorUrl>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
     <description></description>
 
     <!--  Files -->