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, 3 insertions, 3 deletions

diff --git a/modules/tag/tests/Tag_Test.php b/modules/tag/tests/Tag_Test.php
index c9a96286..c96e7f2b 100644
--- a/modules/tag/tests/Tag_Test.php
+++ b/modules/tag/tests/Tag_Test.php
@@ -25,18 +25,18 @@ class Tag_Test extends Unit_Test_Case {
     $tag1 = "tag1";
 
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(1, $tag->count);
 
     // Make sure adding the tag again doesn't increase the count
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(1, $tag->count);
 
     $rand = rand();
     $album = album::create($root, $rand, $rand, $rand);
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(2, $tag->count);
   }
 }
\ No newline at end of file