Merge branch 'master' into talmdal_dev

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

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index b85b5258..5974c6f9 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -43,7 +43,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     $_POST["column"] = "weight";
     $_POST["direction"] = "ASC";
     $_POST["csrf"] = access::csrf_token();
-    $_POST["slug"] = "new_name";
+    $_POST["slug"] = "new-name";
     $_POST["_method"] = "put";
     access::allow(identity::everybody(), "edit", $root);
 
@@ -53,7 +53,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     ob_end_clean();
 
     $this->assert_equal(
-      json_encode(array("result" => "success")),
+      json_encode(array("result" => "success", "location" => "")),
       $results);
     $this->assert_equal("new title", $this->_album->title);
     $this->assert_equal("new description", $this->_album->description);