Merge branch 'master' of github.com:owncloud/core into vcategories_db

Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php

7 files changed, 1 insertions, 11 deletions

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 1b43afa74fb..4f26dedc797 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -5,7 +5,6 @@
  * See the COPYING-README file.
  */
 
-require_once "../../lib/base.php";
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php
index 705330b2c3e..9d43a722852 100644
--- a/core/ajax/requesttoken.php
+++ b/core/ajax/requesttoken.php
@@ -26,7 +26,6 @@
  * @return json: success/error state indicator including a fresh request token
  * @author Christian Reiner
  */
-require_once '../../lib/base.php';
 
 // don't load apps or filesystem for this task
 $RUNTIME_NOAPPS    = true;
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 84e84be5acb..efe01dff886 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -18,10 +18,10 @@
 * You should have received a copy of the GNU Affero General Public
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
-require_once '../../lib/base.php';
 
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+OC_App::loadApps();
 
 if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSource'])) {
 	switch ($_POST['action']) {
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index 75679da2c04..e22cbad4708 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -21,9 +21,6 @@
 *
 */
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 $app = $_POST["app"];
 
 $l = OC_L10N::get( $app );
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index e97612c28f2..23d00af70ab 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -14,8 +14,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index fd7b71be5d3..057c9bb0e94 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -15,8 +15,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index e7f2ff8ce5f..0387b17576c 100644
--- a/core/ajax/vcategories/edit.php
+++ b/core/ajax/vcategories/edit.php
@@ -15,7 +15,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 
 $l = OC_L10N::get('core');