Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

3 files changed, 8 insertions, 2 deletions

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index a2b2e461..74284951 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -35,7 +35,8 @@ class url extends url_Core {
     if ($item && $item->loaded()) {
       Router::$controller = "{$item->type}s";
       Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
-      Router::$method = $item->id;
+      Router::$method = "show";
+      Router::$arguments = array($item);
     }
   }
 
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 445f9b86..0d197597 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -609,7 +609,8 @@ class access_Core {
       $dirs[] = dirname($album->thumb_path());
     }
 
-    $base_url = url::site("file_proxy");
+    $base_url = url::site("?kohana_uri=/file_proxy");
+    $base_url = str_replace("/?", "?", $base_url);
     foreach ($dirs as $dir) {
       if ($value === self::DENY) {
         $fp = fopen("$dir/.htaccess", "w+");
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index 5245b16c..b836292f 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -86,6 +86,10 @@ class theme_Core {
       ->value(module::get_var("gallery", "footer_text"));
     $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text")
       ->checked(module::get_var("gallery", "show_credits"));
+
+    module::event("theme_edit_form", $form);
+
+    $group = $form->group("buttons");
     $group->submit("")->value(t("Save"));
     return $form;
   }