summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-28 00:49:41 -0700
committerBharat Mediratta <bharat@menalto.com>2009-05-28 00:49:41 -0700
commitc1e55e9593a6b0ce9f749eb85c4bca1d649e358a (patch)
tree6f3e44645209471aede760e79a5c7b1836fdba8b /modules/gallery/controllers
parent93053cf83152082ce2fb365ad2ab6034c9edd4ee (diff)
parent8d2782ad1df10679b302ab6c4fafdd2f5535be4a (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers')
-rw-r--r--modules/gallery/controllers/albums.php7
1 files changed, 4 insertions, 3 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":