Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/tests/Albums_Controller_Test.php
	modules/user/helpers/user.php

1 files changed, 1 insertions, 1 deletions

diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index 2e5d7fe3..d2404192 100644
--- a/modules/gallery/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
@@ -47,7 +47,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
     $results = ob_get_contents();
     ob_end_clean();
 
-    $this->assert_equal(json_encode(array("result" => "success")), $results);
+    $this->assert_equal(json_encode(array("result" => "success", "location" => "")), $results);
     $this->assert_equal("new-slug", $photo->slug);
     $this->assert_equal("new title", $photo->title);
     $this->assert_equal("new description", $photo->description);