From d35a0cdb610fc646c329b9622fcb05a4948c3ba2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 3 Apr 2009 15:40:41 +0000
Subject: Fix for ticket #200.  When an error occurs the current uri is no
 longer admin/server_add but admin/server_add/add_path and the equality check
 fails.

---
 modules/server_add/controllers/admin_server_add.php | 2 +-
 modules/server_add/helpers/server_add_theme.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/server_add')

diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index b68ecc97..2209dd08 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -51,7 +51,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
 
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_server_add.html");
-    $view->content->form = $form->render();
+    $view->content->form = $form;
     $view->content->paths = array_keys($paths);
     print $view;
   }
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index bdd71db3..042156a4 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,7 +20,7 @@
 class server_add_theme_Core {
   static function admin_head($theme) {
     $head = array();
-    if (Router::$current_uri == "admin/server_add") {
+    if (strpos(Router::$current_uri, "admin/server_add") !== false) {
       $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("lib/jquery.autocomplete.css") . "\" />";
       $base = url::site("__ARGS__");
-- 
cgit v1.2.3