Merge pull request #190 from joomdev/dev

Dev
joomdev · Oct 2, 2020 · e5d4321 · e5d4321
2 parents 537b2c2 + 48abe70
commit e5d4321
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/astroid/astroid-framework/astroid.xml b/astroid/astroid-framework/astroid.xml
@@ -4,7 +4,7 @@
    <libraryname>astroid</libraryname>
    <author>JoomDev</author>
    <creationDate>Sept 2020</creationDate>
-   <version>2.4.4</version>
+   <version>2.4.5</version>
    <url>https://www.astroidframework.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/astroid/astroid-framework/framework/library/astroid/Component/Menu.php b/astroid/astroid-framework/framework/library/astroid/Component/Menu.php
@@ -15,7 +15,7 @@
 
 if (ASTROID_JOOMLA_VERSION == 3) {
     \JLoader::register('ModMenuHelper', JPATH_SITE . '/modules/mod_menu/helper.php');
-    //\JLoader::registerAlias('MenuHelper', 'ModMenuHelper');
+    \JLoader::registerAlias('MenuHelper', 'ModMenuHelper');
 } else {
     \JLoader::registerAlias('MenuHelper', '\\Joomla\\Module\\Menu\\Site\\Helper\\MenuHelper');
 }
@@ -46,10 +46,10 @@ public static function getMenu($menutype = '', $nav_class = [], $logo = null, $l
         $menu_params = new \JRegistry();
         $menu_params->loadString($header_menu_params);
 
-        $list = \ModMenuHelper::getList($menu_params);
-        $base = \ModMenuHelper::getBase($menu_params);
-        $active = \ModMenuHelper::getActive($menu_params);
-        $default = \ModMenuHelper::getDefault();
+        $list = \MenuHelper::getList($menu_params);
+        $base = \MenuHelper::getBase($menu_params);
+        $active = \MenuHelper::getActive($menu_params);
+        $default = \MenuHelper::getDefault();
 
         $active_id = $active->id;
         $default_id = $default->id;
@@ -573,10 +573,10 @@ public static function getMobileMenu($menutype = '', $nav_class = [])
         $menu_params = new \JRegistry();
         $menu_params->loadString($header_menu_params);
 
-        $list = \ModMenuHelper::getList($menu_params);
-        $base = \ModMenuHelper::getBase($menu_params);
-        $active = \ModMenuHelper::getActive($menu_params);
-        $default = \ModMenuHelper::getDefault();
+        $list = \MenuHelper::getList($menu_params);
+        $base = \MenuHelper::getBase($menu_params);
+        $active = \MenuHelper::getActive($menu_params);
+        $default = \MenuHelper::getDefault();
 
         $active_id = $active->id;
         $default_id = $default->id;

diff --git a/astroid/astroid-framework/framework/library/astroid/Helper/Constants.php b/astroid/astroid-framework/framework/library/astroid/Helper/Constants.php
@@ -13,7 +13,7 @@
 
 class Constants 
 {
-    public static $astroid_version = '2.4.4';
+    public static $astroid_version = '2.4.5';
     public static $fontawesome_version = '5.14.0';
     public static $animatecss_version = '3.7.0';
     public static $forum_link = 'https://www.joomdev.com/forum/astroid-framework';

diff --git a/astroid/astroid-framework/plugins/astroid/astroid.xml b/astroid/astroid-framework/plugins/astroid/astroid.xml
@@ -3,7 +3,7 @@
    <name>Astroid Plugin</name>
    <author>JoomDev</author>
    <creationDate>Sept 2020</creationDate>
-   <version>2.4.4</version>
+   <version>2.4.5</version>
    <url>https://www.astroidframework.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/pkg_astroid.xml b/pkg_astroid.xml
@@ -6,7 +6,7 @@
    <packagerurl>https://www.astroidframework.com</packagerurl>
    <author>JoomDev</author>
    <creationDate>Sept 2020</creationDate>
-   <version>2.4.4</version>
+   <version>2.4.5</version>
    <url>https://www.joomdev.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>