Синхронизировал частично с CMS2

src/controller/state.php

@@ -13,7 +13,7 @@ class Controller_State
 
     static function make($action)
     {
-        return new State($action);
+        return new Controller_State($action);
     }
 
     public function addTitle($name, $url = array())
@@ -22,7 +22,7 @@ class Controller_State
         return $this;
     }
 
-    public function addState(State $state)
+    public function addState(Controller_State $state)
     {
         $this->states [$state->getAction()] = $state;
         return $this;
@@ -49,7 +49,7 @@ class Controller_State
         return false;
     }
 
-    function makeTitle($module)
+    function makeTitle(Controller_Action $module)
     {
         foreach ($this->titles as $item) {
             $module->path->addMenuItem($module->nUrl($this->action, $item[1]), $item[0]);
@@ -68,12 +68,3 @@ class Controller_State
         }
     }
 }
-
-
-/*
-$path = State::make('index')
-        ->addState(State::make('form'))
-        ->addState(State::make('view'));
-
-$path->getPath(0, 'form');
-*/