Fix broken html::script() and url::file() references to the newly

moved gallery module.

2 files changed, 14 insertions, 13 deletions

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 03a64f43..5ccadb37 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -113,8 +113,9 @@ class Albums_Controller extends Items_Controller {
               "resource" => url::site("albums/$new_album->id")));
     } else {
       print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString() . html::script("gallery/js/albums_form_add.js")));
+        array(
+          "result" => "error",
+          "form" => $form->__toString() . html::script("modules/gallery/js/albums_form_add.js")));
     }
   }
 
@@ -206,7 +207,7 @@ class Albums_Controller extends Items_Controller {
     switch ($this->input->get("type")) {
     case "album":
       print album::get_add_form($album) .
-        html::script("gallery/js/albums_form_add.js");
+        html::script("modules/gallery/js/albums_form_add.js");
       break;
 
     case "photo":
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 0acccb45..d45e1b98 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -23,30 +23,30 @@ class gallery_theme_Core {
     $buf = "";
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("gallery/css/debug.css") . "\" />";
+        url::file("modules/gallery/css/debug.css") . "\" />";
     }
     if (($theme->page_type == "album" || $theme->page_type == "photo")
         && access::can("edit", $theme->item())) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("gallery/css/quick.css") . "\" />";
-      $buf .= html::script("gallery/js/quick.js");
+        url::file("modules/gallery/css/quick.css") . "\" />";
+      $buf .= html::script("modules/gallery/js/quick.js");
     }
     if ($theme->page_type == "photo" && access::can("view_full", $theme->item())) {
       $buf .= "<script type=\"text/javascript\" >" .
               "  var fullsize_detail = { " .
-              "    close: \"" . url::file("gallery/images/ico-close.png") . "\", " .
+              "    close: \"" . url::file("modules/gallery/images/ico-close.png") . "\", " .
               "    url: \"" . $theme->item()->file_url() . "\", " .
               "    width: " . $theme->item()->width . ", " .
               "    height: " . $theme->item()->height . "};" .
               "</script>";
-      $buf .= html::script("gallery/js/fullsize.js");
+      $buf .= html::script("modules/gallery/js/fullsize.js");
     }
 
     if ($session->get("l10n_mode", false)) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("gallery/css/l10n_client.css") . "\" />";
+        url::file("modules/gallery/css/l10n_client.css") . "\" />";
       $buf .= html::script("lib/jquery.cookie.js");
-      $buf .= html::script("gallery/js/l10n_client.js");
+      $buf .= html::script("modules/gallery/js/l10n_client.js");
     }
 
     return $buf;
@@ -83,14 +83,14 @@ class gallery_theme_Core {
     $buf = "";
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("gallery/css/debug.css") . "\" />";
+        url::file("modules/gallery/css/debug.css") . "\" />";
     }
 
     if ($session->get("l10n_mode", false)) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("gallery/css/l10n_client.css") . "\" />";
+        url::file("modules/gallery/css/l10n_client.css") . "\" />";
       $buf .= html::script("lib/jquery.cookie.js");
-      $buf .= html::script("gallery/js/l10n_client.js");
+      $buf .= html::script("modules/gallery/js/l10n_client.js");
     }
 
     return $buf;