Merge branch 'master' into sharing. Integrate with changes in master, rename classes

Conflicts:
	lib/base.php

3 files changed, 5 insertions, 5 deletions

diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index b2c3a477958..6e860d584ea 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -9,7 +9,7 @@ $uid_shared_with = $_GET['uid_shared_with'];
 $permissions = $_GET['permissions'];
 foreach ($sources as $source) {
 	foreach ($uid_shared_with as $uid) {
-		new OC_SHARE($source, $uid, $permissions);
+		new OC_Share($source, $uid, $permissions);
 	}
 }
 
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
index 4d83d332257..78d7d2e25f0 100644
--- a/apps/files_sharing/ajax/unshare.php
+++ b/apps/files_sharing/ajax/unshare.php
@@ -6,6 +6,6 @@ require_once('../lib_share.php');
 
 $source = $_GET['source'];
 $uid_shared_with = $_GET['uid_shared_with'];
-OC_SHARE::unshare($source, $uid_shared_with);
+OC_Share::unshare($source, $uid_shared_with);
 
 ?>
\ No newline at end of file
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
index 6e1469ae348..816e01ba9ee 100644
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ b/apps/files_sharing/ajax/userautocomplete.php
@@ -3,7 +3,7 @@ $RUNTIME_NOAPPS = true;
 
 require_once('../../../lib/base.php');
 
-if (!OC_USER::isLoggedIn()) {
+if (!OC_User::isLoggedIn()) {
 	echo json_encode(array("status" => "error", "data" => array("message" => "Authentication error")));
 	exit();
 }
@@ -11,8 +11,8 @@ $query = $_GET['term'];
 $length = strlen($query);
 $query = strtolower($query);
 $users = array();
-$ocusers = OC_USER::getUsers();
-$self = OC_USER::getUser();
+$ocusers = OC_User::getUsers();
+$self = OC_User::getUser();
 $groups = OC_GROUP::getUserGroups($self);
 foreach ($ocusers as $user) {
 	if ($user != $self && substr(strtolower($user), 0, $length) == $query) {