Properly implement 'root' as a legal factory type

1 files changed, 6 insertions, 3 deletions

diff --git a/core/libraries/Menu.php b/core/libraries/Menu.php
index 26621351..6cc877cb 100644
--- a/core/libraries/Menu.php
+++ b/core/libraries/Menu.php
@@ -90,7 +90,7 @@ class Menu_Element_Dialog extends Menu_Element {
  */
 class Menu_Core extends Menu_Element {
   public $elements;
-  public $is_root;
+  public $is_root = false;
 
   /**
    * Return an instance of a Menu_Element
@@ -105,6 +105,10 @@ class Menu_Core extends Menu_Element {
       return new Menu_Element_Dialog();
 
     case "root":
+      $menu = new Menu();
+      $menu->is_root = true;
+      return $menu;
+
     case "submenu":
       return new Menu();
 
@@ -113,9 +117,8 @@ class Menu_Core extends Menu_Element {
     }
   }
 
-  public function __construct($is_root=false) {
+  public function __construct() {
     $this->elements = array();
-    $this->is_root = $is_root;
   }
 
   /**