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, 1 insertions, 13 deletions

diff --git a/lib/group.php b/lib/group.php
index 7967e1a581b..ceee5fa4edb 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -84,7 +84,7 @@ class OC_Group {
 		OC_Hook::emit( "OC_Group", "pre_createGroup", array( "run" => &$run, "gid" => $gid ));
 
 		if($run){
-			//create the user in the first backend that supports creating users
+			//create the group in the first backend that supports creating groups
 			foreach(self::$_usedBackends as $backend){
 				if(!$backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP))
 					continue;
@@ -141,9 +141,6 @@ class OC_Group {
 	 */
 	public static function inGroup( $uid, $gid ){
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_IN_GROUP))
-				continue;
-
 			if($backend->inGroup($uid,$gid)){
 				return true;
 			}
@@ -228,9 +225,6 @@ class OC_Group {
 	public static function getUserGroups( $uid ){
 		$groups=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_USER_GROUPS))
-				continue;
-
 			$groups=array_merge($backend->getUserGroups($uid),$groups);
 		}
 		asort($groups);
@@ -246,9 +240,6 @@ class OC_Group {
 	public static function getGroups(){
 		$groups=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_GROUPS))
-				continue;
-
 			$groups=array_merge($backend->getGroups(),$groups);
 		}
 		asort($groups);
@@ -276,9 +267,6 @@ class OC_Group {
 	public static function usersInGroup($gid){
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_USERS))
-				continue;
-
 			$users=array_merge($backend->usersInGroup($gid),$users);
 		}
 		return $users;