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

4 files changed, 12 insertions, 11 deletions

diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index da0a7983..7b4d68f6 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -98,7 +98,7 @@ class Packager_Controller extends Controller {
       print "$sql_file is not writeable";
       return;
     }
-    $command = "mysqldump --compact --add-drop-table -h{$conn['host']} " .
+    $command = "mysqldump --compact --skip-extended-insert --add-drop-table -h{$conn['host']} " .
       "-u{$conn['user']} $pass {$conn['database']} > $sql_file";
     exec($command, $output, $status);
     if ($status) {
@@ -153,7 +153,7 @@ class Packager_Controller extends Controller {
         $paths[] = "VARPATH . \"" . substr($name, strlen(VARPATH)) . "\"";
       } else {
         // @todo: serialize non-directories
-        print "Unknown file: $name";
+        print "IGNORING FILE: $name\n";
         return;
       }
     }
diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index a059f986..75a7b810 100644
--- a/modules/gallery/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
@@ -58,13 +58,13 @@ class Simple_Uploader_Controller extends Controller {
         $path_info = @pathinfo($temp_filename);
         if (array_key_exists("extension", $path_info) &&
             in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) {
-          $movie = movie::create($album, $temp_filename, $name, $title);
+          $item = movie::create($album, $temp_filename, $name, $title);
           log::success("content", t("Added a movie"),
-                       html::anchor("movies/$movie->id", t("view movie")));
+                       html::anchor("movies/$item->id", t("view movie")));
         } else {
-          $photo = photo::create($album, $temp_filename, $name, $title);
+          $item = photo::create($album, $temp_filename, $name, $title);
           log::success("content", t("Added a photo"),
-                       html::anchor("photos/$photo->id", t("view photo")));
+                       html::anchor("photos/$item->id", t("view photo")));
         }
       } catch (Exception $e) {
         Kohana::log("alert", $e->__toString());
@@ -76,7 +76,7 @@ class Simple_Uploader_Controller extends Controller {
         return;
       }
       unlink($temp_filename);
-      print "FILEID: $photo->id";
+      print "FILEID: $item->id";
     } else {
       header("HTTP/1.1 400 Bad Request");
       print "ERROR: Invalid Upload";
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index 32e34ef3..3ac97f8e 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -11,6 +11,7 @@ $(document).ready(function() {
 var show_quick = function() {
   var cont = $(this);
   var quick = $(this).find(".gQuick");
+  var img = cont.find(".gThumbnail,.gResize");
   $("#gQuickPane").remove();
   cont.append("<div id=\"gQuickPane\"></div>");
   $("#gQuickPane").hide();
@@ -21,10 +22,10 @@ var show_quick = function() {
     function(data, textStatus) {
       $("#gQuickPane").html(data).slideDown("fast");
       $(".ui-state-default").hover(
-        function(){
+        function() {
           $(this).addClass("ui-state-hover");
         },
-        function(){
+        function() {
           $(this).removeClass("ui-state-hover");
         }
       );
@@ -45,7 +46,7 @@ var quick_do = function(cont, pane, img) {
     return false;
   }
   if (pane.hasClass("gDialogLink")) {
-    openDialog(pane, function() { window.location.reload(); });
+    openDialog(pane);
   } else {
     img.css("opacity", "0.1");
     cont.addClass("gLoadingLarge");
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 9ede49b6..d37be7d3 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -207,7 +207,7 @@ class Menu_Core extends Menu_Element {
 
   public function __toString() {
     $html = $this->is_root ? "<ul class=\"gMenu\">" :
-      "<li title=\"$this->label\"><a href=#>$this->label</a><ul class=\"gMenu\">";
+      "<li title=\"$this->label\"><a href=\"#\">$this->label</a><ul class=\"gMenu\">";
     $html .= implode("\n", $this->elements);
     $html .= $this->is_root ? "</ul>" : "</ul></li>";
     return $html;