Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index de19648d..aa91d6f2 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -29,12 +29,12 @@ class Comment_Model_Test extends Unit_Test_Case {
     access::allow(identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
-      ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
+      ORM::factory("comment")->viewable()->where("comments.id", "=", $comment->id)->count_all());
 
     // We can't see the comment when permissions are denied on the album
     access::deny(identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
-      ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
+      ORM::factory("comment")->viewable()->where("comments.id", "=", $comment->id)->count_all());
   }
 }