| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | 3 | * @package FirePlugins Framework |
| 4 | - * @version 1.0.27 | |
| 4 | + * @version 1.2.6 | |
| 5 | 5 | * |
| 6 | 6 | * @author FirePlugins <[email protected]> |
| 7 | 7 | * @link https://www.fireplugins.com |
| 8 | - * @copyright Copyright © 2022 FirePlugins All Rights Reserved | |
| 8 | + * @copyright Copyright © 2026 FirePlugins All Rights Reserved | |
| 9 | 9 | * @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html> or later |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | namespace FPFramework\Admin\Menu; |
| @@ -102,51 +102,15 @@ | ||
| 102 | 102 | $menu = new Registry($menu); |
| 103 | 103 | |
| 104 | 104 | // Top level menu item |
| 105 | 105 | if ($menu->get('is_parent')) { |
| 106 | - $this->manager->addMenuPage([ | |
| 107 | - 'page_title' => $menu->get('page_title'), | |
| 108 | - 'menu_title' => $menu->get('menu_title'), | |
| 109 | - 'menu_slug' => $menu->get('menu_slug'), | |
| 110 | - 'icon_url' => $menu->get('icon_url'), | |
| 111 | - 'position' => $menu->get('position'), | |
| 112 | - 'controller' => $menu->get('controller') | |
| 113 | - ]); | |
| 106 | + // Pass the already-built Registry through instead of rebuilding an array | |
| 107 | + // (Manager::addMenuPage/addSubmenuPage skip re-wrapping when given a Registry). | |
| 108 | + $this->manager->addMenuPage($menu); | |
| 114 | 109 | } |
| 115 | 110 | else //second level menu items |
| 116 | 111 | { |
| 117 | - $args = [ | |
| 118 | - 'page_title' => $menu->get('page_title') | |
| 119 | - ]; | |
| 120 | - | |
| 121 | - $args['render_callback'] = $menu->get('render_callback', true); | |
| 122 | - | |
| 123 | - if (!empty($menu->get('parent'))) | |
| 124 | - { | |
| 125 | - $args['parent'] = $menu->get('parent'); | |
| 126 | - } | |
| 127 | - | |
| 128 | - if (!empty($menu->get('menu_title'))) | |
| 129 | - { | |
| 130 | - $args['menu_title'] = $menu->get('menu_title'); | |
| 131 | - } | |
| 132 | - | |
| 133 | - if (!empty($menu->get('menu_slug'))) | |
| 134 | - { | |
| 135 | - $args['menu_slug'] = $menu->get('menu_slug'); | |
| 136 | - } | |
| 137 | - | |
| 138 | - if (!empty($menu->get('custom_url'))) | |
| 139 | - { | |
| 140 | - $args['custom_url'] = $menu->get('custom_url'); | |
| 141 | - } | |
| 142 | - | |
| 143 | - if (!empty($menu->get('controller'))) | |
| 144 | - { | |
| 145 | - $args['controller'] = $menu->get('controller'); | |
| 146 | - } | |
| 147 | - | |
| 148 | - $this->manager->addSubmenuPage($args); | |
| 112 | + $this->manager->addSubmenuPage($menu); | |
| 149 | 113 | } |
| 150 | 114 | } |
| 151 | 115 | } |
| 152 | 116 | |
