Merge branch 'unstable'

Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php

1 files changed, 7 insertions, 13 deletions

diff --git a/lib/user.php b/lib/user.php
index 9bfbfd8ee70..f1903093d6d 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -168,9 +168,7 @@ class OC_User {
 		if( $run ){
 			//delete the user from all backends
 			foreach(self::$_usedBackends as $backend){
-				if($backend->implementsActions(OC_USER_BACKEND_DELETE_USER)){
-					$backend->deleteUser($uid);
-				}
+				$backend->deleteUser($uid);
 			}
 			// We have to delete the user from all groups
 			foreach( OC_Group::getUserGroups( $uid ) as $i ){
@@ -332,11 +330,9 @@ class OC_User {
 	public static function getUsers(){
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
-			if($backend->implementsActions(OC_USER_BACKEND_GET_USERS)){
-				$backendUsers=$backend->getUsers();
-				if(is_array($backendUsers)){
-					$users=array_merge($users,$backendUsers);
-				}
+			$backendUsers=$backend->getUsers();
+			if(is_array($backendUsers)){
+				$users=array_merge($users,$backendUsers);
 			}
 		}
 		asort($users);
@@ -350,11 +346,9 @@ class OC_User {
 	 */
 	public static function userExists($uid){
 		foreach(self::$_usedBackends as $backend){
-			if($backend->implementsActions(OC_USER_BACKEND_USER_EXISTS)){
-				$result=$backend->userExists($uid);
-				if($result===true){
-					return true;
-				}
+			$result=$backend->userExists($uid);
+			if($result===true){
+				return true;
 			}
 		}
 		return false;