Merge remote branch 'gallery3/master'

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 3005eb67..2b6e4186 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -31,18 +31,18 @@ class Organize_Controller extends Controller {
       $sort_fields[$field] = (string)$description;
     }
     $sort_order = array("ASC" => (string)t("Ascending"), "DESC" => (string)t("Descending"));
-    $file_filter = json_encode(
-      array("photo" => array("label" => "Images",
-                             "types" => array("*.jpg", "*.jpeg", "*.png", "*.gif")),
-            "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4", "*.m4v"))));
+    $file_filter = json_encode(array(
+      "photo" => array("label" => "Images", "types" => array("*.jpg", "*.jpeg", "*.png", "*.gif")),
+      "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4", "*.m4v"))));
 
     $v = new View("organize_dialog.html");
     $v->album = $album;
-    $v->domain = $input->server("SERVER_NAME");
+    $v->domain = $input->server("HTTP_HOST");
     $v->access_key = rest::access_key();
     $v->file_filter = addslashes($file_filter);
     $v->sort_order = addslashes(json_encode($sort_order));
     $v->sort_fields = addslashes(json_encode($sort_fields));
+    $v->selected_id = Input::instance()->get("selected_id", null);
     $v->rest_uri = url::site("rest") . "/";
     $v->controller_uri = url::site("organize") . "/";
     $v->swf_uri = url::file("modules/organize/lib/Gallery3WebClient.swf?") .