Merge pull request #1178 from owncloud/return_true_because_of_ponies

Remove uneeded return

2 files changed, 1 insertions, 8 deletions

diff --git a/lib/public/user.php b/lib/public/user.php
index 9e50115ab70..e297b716dc2 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -73,12 +73,10 @@ class User {
 	}
 	/**
 	 * @brief Loggs the user out including all the session data
-	 * @returns true
-	 *
 	 * Logout, destroys session
 	 */
 	public static function logout() {
-		return \OC_USER::logout();
+		\OC_USER::logout();
 	}
 
 	/**
diff --git a/lib/user.php b/lib/user.php
index 8d4eb7aec4d..fd0ed6ecd3a 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -260,17 +260,13 @@ class OC_User {
 
 	/**
 	 * @brief Sets user id for session and triggers emit
-	 * @returns true
-	 *
 	 */
 	public static function setUserId($uid) {
 		$_SESSION['user_id'] = $uid;
-		return true;
 	}
 
 	/**
 	 * @brief Logs the current user out and kills all the session data
-	 * @returns true
 	 *
 	 * Logout, destroys session
 	 */
@@ -279,7 +275,6 @@ class OC_User {
 		session_unset();
 		session_destroy();
 		OC_User::unsetMagicInCookie();
-		return true;
 	}
 
 	/**