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

gallery · Sep 2, 2010 · 545177c · 545177c
2 parents 04f6646 + 70c8572
commit 545177c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
@@ -550,7 +550,9 @@ static function upgrade($version) {
     }
 
     if ($version == 26) {
-      $db->query("RENAME TABLE {failed_logins} TO {failed_auths}");
+      if (in_array("failed_logins", Database::instance()->list_tables())) {
+        $db->query("RENAME TABLE {failed_logins} TO {failed_auths}");
+      }
       module::set_version("gallery", $version = 27);
     }
 

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
@@ -60,7 +60,7 @@ function(data) {
           $("#g-add-photos-status ul").append(
             "<li id=\"q" + queueID + "\" class=\"g-success\">" + fileObj.name + " - " +
             <?= t("Completed")->for_js() ?> + "</li>");
-          setTimeout(function() { $("#q" + queueID).slideUp("slow") }, 5000);
+          setTimeout(function() { $("#q" + queueID).slideUp("slow").remove() }, 5000);
           success_count++;
           update_status();
           return true;
@@ -87,8 +87,8 @@ function(data) {
               .replace("__TYPE__", errorObj.type));
           }
           $("#g-add-photos-status ul").append(
-            "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
-          $("#g-uploadify" + queueID).remove();
+            "<li id=\"q" + queueID + "\" class=\"g-error\">" + fileObj.name + msg + "</li>");
+          $("#g-uploadify").uploadifyCancel(queueID);
           error_count++;
           update_status();
         },

diff --git a/modules/rest/helpers/rest_installer.php b/modules/rest/helpers/rest_installer.php
@@ -35,7 +35,9 @@ static function install() {
   static function upgrade($version) {
     $db = Database::instance();
     if ($version == 1) {
-      $db->query("RENAME TABLE {user_access_tokens} TO {user_access_keys}");
+      if (in_array("user_access_tokens", Database::instance()->list_tables())) {
+        $db->query("RENAME TABLE {user_access_tokens} TO {user_access_keys}");
+      }
       module::set_version("rest", $version = 2);
     }