Continuation of r20518. Remove all the cases were the csrf values in

views were being manually set.  Also removed it from the Admin_View.

5 files changed, 0 insertions, 6 deletions

diff --git a/core/controllers/admin_maintenance.php b/core/controllers/admin_maintenance.php
index 52378fbc..794f2253 100644
--- a/core/controllers/admin_maintenance.php
+++ b/core/controllers/admin_maintenance.php
@@ -59,7 +59,6 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     $task = task::create($tasks[$task_callback], array());
 
     $view = new View("admin_maintenance_task.html");
-    $view->csrf = access::csrf_token();
     $view->task = $task;
 
     log::info("tasks", t("Task %task_name started (task id %task_id)",
@@ -80,7 +79,6 @@ class Admin_Maintenance_Controller extends Admin_Controller {
       throw new Exception("@todo MISSING_TASK");
     }
     $view = new View("admin_maintenance_task.html");
-    $view->csrf = access::csrf_token();
     $view->task = $task;
 
     log::info("tasks", t("Task %task_name resumed (task id %task_id)",
diff --git a/core/controllers/admin_themes.php b/core/controllers/admin_themes.php
index 6ace4036..e6751bed 100644
--- a/core/controllers/admin_themes.php
+++ b/core/controllers/admin_themes.php
@@ -53,7 +53,6 @@ class Admin_Themes_Controller extends Admin_Controller {
     } else {
       $view->url = url::site("albums/1?theme=$theme_name");
     }
-    $view->csrf = access::csrf_token();
     print $view;
   }
 
diff --git a/core/controllers/quick.php b/core/controllers/quick.php
index 166591fd..1b6e2bf8 100644
--- a/core/controllers/quick.php
+++ b/core/controllers/quick.php
@@ -26,7 +26,6 @@ class Quick_Controller extends Controller {
 
     $view = new View("quick_pane.html");
     $view->item = $item;
-    $view->csrf = access::csrf_token();
     print $view;
   }
 
diff --git a/core/controllers/simple_uploader.php b/core/controllers/simple_uploader.php
index eab9e14c..c369e9f2 100644
--- a/core/controllers/simple_uploader.php
+++ b/core/controllers/simple_uploader.php
@@ -24,7 +24,6 @@ class Simple_Uploader_Controller extends Controller {
 
     $v = new View("simple_uploader.html");
     $v->item = $item;
-    $v->csrf = access::csrf_token();
     print $v;
   }
 
diff --git a/core/libraries/Admin_View.php b/core/libraries/Admin_View.php
index 7d95dd0f..4a6b4ef0 100644
--- a/core/libraries/Admin_View.php
+++ b/core/libraries/Admin_View.php
@@ -44,7 +44,6 @@ class Admin_View_Core extends View {
     $this->sidebar = "";
     $this->set_global("theme", $this);
     $this->set_global("user", user::active());
-    $this->set_global("csrf", access::csrf_token());
   }
 
   public function url($path, $absolute_url=false) {