Merge branch 'master' into quickformorigin/quickform

Conflicts:
	data/templates/bookmarks.tpl.php
	data/templates/sidebar.block.search.php
	data/templates/top.inc.php
	doc/developers/TODO
	src/SemanticScuttle/header.php

1 files changed, 4 insertions, 5 deletions

diff --git a/tests/UserTest.php b/tests/UserTest.php
index 18870c8..f0a7427 100644
--- a/tests/UserTest.php
+++ b/tests/UserTest.php
@@ -12,13 +12,12 @@
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
-
-require_once 'prepare.php';
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'UserTest::main');
 }
 
+require_once 'prepare.php';
+
 /**
  * Unit tests for the SemanticScuttle user service.
  *
@@ -211,7 +210,7 @@ class UserTest extends TestBase
         $uid = $this->addUser();
         $users = $this->us->getObjectUsers();
         $this->assertEquals(1, count($users));
-        $this->assertType('SemanticScuttle_Model_User', reset($users));
+        $this->assertInstanceOf('SemanticScuttle_Model_User', reset($users));
     }
 
 
@@ -228,7 +227,7 @@ class UserTest extends TestBase
         $uid3 = $this->addUser();
         $users = $this->us->getObjectUsers();
         $this->assertEquals(3, count($users));
-        $this->assertType('SemanticScuttle_Model_User', reset($users));
+        $this->assertInstanceOf('SemanticScuttle_Model_User', reset($users));
     }