diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-15 02:41:34 +0400 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-15 02:41:34 +0400 |
| commit | 388bb6a5e1e8465b11f33f1820f023db271ba9d9 (patch) | |
| tree | 6fee16bd0151b051cfabd97db9d285e6b8b69c29 /lib/migrate.php | |
| parent | e475c26f1ae3adec2716b4ba59f92382db2bc24e (diff) | |
| parent | 71ae41716a56305ab9509571c0a84311b9f3eb63 (diff) | |
Merge branch 'master' into fixing-unused-and-undefined-in-master
Diffstat (limited to 'lib/migrate.php')
| -rw-r--r-- | lib/migrate.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/migrate.php b/lib/migrate.php index 8fabbbca927..87bdd016fe4 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -219,7 +219,7 @@ class OC_Migrate{ // We need to be an admin if we are not importing our own data if(($type == 'user' && self::$uid != $currentuser) || $type != 'user' ) { - if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) { + if( !OC_User::isAdminUser($currentuser)) { // Naughty. OC_Log::write( 'migration', 'Import not permitted.', OC_Log::ERROR ); return json_encode( array( 'success' => false ) ); |