3 files changed, 10 insertions, 7 deletions
diff --git a/core/libraries/Admin_View.php b/core/libraries/Admin_View.php
index 267d06e8..dcfbca4a 100644
--- a/core/libraries/Admin_View.php
+++ b/core/libraries/Admin_View.php
@@ -45,7 +45,7 @@ class Admin_View_Core extends View {
   }
 
   public function admin_menu() {
-    $menu = new Menu(true);
+    $menu = Menu::factory("root");
     core_menu::admin($menu, $this);
 
     foreach (module::installed() as $module) {
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;
   }
 
   /**
diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index 8031b9af..f2059f77 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -59,7 +59,7 @@ class Theme_View_Core extends View {
   }
 
   public function site_menu() {
-    $menu = new Menu(true);
+    $menu = Menu::factory("root");
     core_menu::site($menu, $this);
 
     foreach (module::installed() as $module) {
@@ -76,7 +76,7 @@ class Theme_View_Core extends View {
   }
 
   public function album_menu() {
-    $menu = new Menu(true);
+    $menu = Menu::factory("root");
     core_menu::album($menu, $this);
 
     foreach (module::installed() as $module) {
@@ -93,7 +93,7 @@ class Theme_View_Core extends View {
   }
 
   public function photo_menu() {
-    $menu = new Menu(true);
+    $menu = Menu::factory("root");
     core_menu::photo($menu, $this);
 
     foreach (module::installed() as $module) {