Merge branch 'master' of github.com:centurion-project/Centurion

daveshow · Jun 7, 2012 · e10f64e · e10f64e
2 parents 71241ea + e3ba9cd
commit e10f64e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/library/Centurion/Contrib/admin/controllers/AdminNavigationController.php b/library/Centurion/Contrib/admin/controllers/AdminNavigationController.php
@@ -94,7 +94,7 @@ public function editAction()
             foreach ($types as $type) {
                 if (isset($type['className']) && $row->proxy->getTable() instanceof $type['className']) {
                     if (isset($type['urlEdit'])) {
-                        $type['urlEdit']['_next'] = urlencode($this->view->url(array('action' => 'index')));
+                        $type['urlEdit']['_next'] = $this->view->url(array('action' => 'index'));
                         $type['urlEdit']['id'] = $row->proxy->id;
                         $this->_redirect($this->view->url($type['urlEdit']));
                         die();
@@ -133,4 +133,4 @@ public function addProxyAction()
         $this->_redirect($this->view->url(array('controller' => $this->getRequest()->getControllerName(), 'module' => $this->getRequest()->getModuleName(), 'action' => 'index', 'proxy_pk' => null, 'proxy_model' => null), 'default'));
         die();
     }
-}
+}
diff --git a/library/Centurion/Contrib/admin/views/scripts/admin-navigation/index.phtml b/library/Centurion/Contrib/admin/views/scripts/admin-navigation/index.phtml
@@ -27,7 +27,7 @@ $urls = array();
         foreach ($this->types as $type => $config):
 
            $extraParam = array();
-           $extraParam['_next'] = urlencode($this->url(array('action' => 'add-proxy', 'proxy_pk' => '___pk___', 'proxy_model' => '___model___')));
+           $extraParam['_next'] = $this->url(array('action' => 'add-proxy', 'proxy_pk' => '___pk___', 'proxy_model' => '___model___'));
            $url = $this->url(array_merge($config['urlNew'], $extraParam));
            $urls[] = '\'' . $type .'\' : "' . addslashes($url) . '"';
         endforeach;
@@ -75,4 +75,4 @@ $(function(){
 </form>
 <?php
 
-echo $this->partial('mptt/index.phtml', $this);
+echo $this->partial('mptt/index.phtml', $this);