4 files changed, 37 insertions, 4 deletions
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 133066d7..31231ca6 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -73,6 +73,10 @@ class Gallery_View_Core extends View {
   protected function combine_files($files, $type) {
     $links = array();
 
+    if (empty($files)) {
+      return;
+    }
+
     // Include the url in the cache key so that if the Gallery moves, we don't use old cached
     // entries.
     $key = array(url::abs_file(""));
@@ -104,7 +108,10 @@ class Gallery_View_Core extends View {
       }
 
       $cache->set($key, $contents, array($type), 30 * 84600);
-      if (function_exists("gzencode")) {
+
+      $use_gzip = function_exists("gzencode") &&
+        (int) ini_get("zlib.output_compression") === 0;
+      if ($use_gzip) {
         $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
                     array($type, "gzip"), 30 * 84600);
       }
diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 2bd9b4eb..1d3c1ef3 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class ORM extends ORM_Core {
+  // Track the original value of this ORM instance so that we can look it up in ORM::original()
+  protected $original = null;
+
   public function open_paren() {
     $this->db->open_paren();
     return $this;
@@ -29,8 +32,30 @@ class ORM extends ORM_Core {
   }
 
   public function save() {
-    model_cache::clear($this->object_name, $this->{$this->primary_key}, $this->primary_key);
-    return parent::save();
+    model_cache::clear();
+    $result = parent::save();
+    $this->original = $this->object;
+    return $result;
+  }
+
+  public function __set($column, $value) {
+    if (!isset($this->original)) {
+      $this->original = $this->object;
+    }
+
+    return parent::__set($column, $value);
+  }
+
+  public function __unset($column) {
+    if (!isset($this->original)) {
+      $this->original = $this->object;
+    }
+
+    return parent::__unset($column);
+  }
+
+  public function original($column) {
+    return $this->original[$column];
   }
 }
 
diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index 96dcc71b..84ee0892 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -45,7 +45,7 @@ class View extends View_Core {
   }
 
   public function body_attributes() {
-    if (locale::is_rtl()) {
+    if (locales::is_rtl()) {
       return 'class="rtl"';
     }
     return '';
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 46280d95..e371f159 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -285,6 +285,7 @@ class ORM_MPTT_Core extends ORM {
 
     // Lets reload to get the changes.
     $this->reload();
+    $target->reload();
     return $this;
   }