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

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 27157d6e..36ced2bb 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -34,13 +34,13 @@ class Gallery_Installer_Test extends Unit_Test_Case {
   }
 
   public function install_creates_root_item_test() {
-    $max_right = ORM::factory("item")
-      ->select("MAX(`right`) AS `right`")
-      ->find()->right;
+    $max_right_ptr = ORM::factory("item")
+      ->select("MAX(`right_ptr`) AS `right_ptr`")
+      ->find()->right_ptr;
     $root = ORM::factory('item')->find(1);
     $this->assert_equal("Gallery", $root->title);
-    $this->assert_equal(1, $root->left);
-    $this->assert_equal($max_right, $root->right);
+    $this->assert_equal(1, $root->left_ptr);
+    $this->assert_equal($max_right_ptr, $root->right_ptr);
     $this->assert_equal(null, $root->parent_id);
     $this->assert_equal(1, $root->level);
   }