Merge in from pre_0.1 branch

git-svn-id: file:///svn-source/pmgr/trunk/site@847 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-09-15 02:38:28 +00:00
parent 7b3707ef89
commit cc12d5ff93
128 changed files with 4126 additions and 1330 deletions
--- a/app_helper.php
+++ b/app_helper.php
@@ -39,7 +39,7 @@ App::import('Core', 'Helper');
 class AppHelper extends Helper {

  function url($url = null, $full = false) {
-    foreach(array('admin_route', 'dev_route') AS $mod) {
+    foreach(array('sand_route', 'dev_route') AS $mod) {
      if (isset($this->params[$mod]) && is_array($url) && !isset($url[$mod]))
            $url[$mod] = $this->params[$mod];
    }