Last of changes required from Bharat's 2nd review pass

2 files changed, 3 insertions, 29 deletions

diff --git a/modules/server_add/helpers/server_add_block.php b/modules/server_add/helpers/server_add_block.php
deleted file mode 100644
index 34ed644c..00000000
--- a/modules/server_add/helpers/server_add_block.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class server_add_block_Core {
-  static function head($theme) {
-    return html::script("modules/server_add/js/server_add.js");
-  }
-}
diff --git a/modules/server_add/helpers/server_add_installer.php b/modules/server_add/helpers/server_add_installer.php
index 8b1c4688..d00556df 100644
--- a/modules/server_add/helpers/server_add_installer.php
+++ b/modules/server_add/helpers/server_add_installer.php
@@ -29,8 +29,8 @@ class server_add_installer {
       module::set_version("server_add", 1);
       module::set_var("server_add", "authorized_paths", serialize(array()));
       message::warning(
-        t("You have no upload directories, click <a href='%url'>here</a> to configure one",
-          array("url" => url::site("/admin/server_add"))));
+        t("You have no upload directories, click <a href='%url'>Configure them now</a> " .
+          "to configure one", array("url" => url::site("/admin/server_add"))));
     }
   }
 
@@ -38,9 +38,7 @@ class server_add_installer {
     access::delete_permission("server_add");
     $module = module::get("server_add");
 
-    $db = Database::instance();
-    $db->delete("vars", array("module_name" => $module->name));
-
+    // @todo remove this after the next alpha
     module::delete("local_import");
     module::delete("server_add");
   }