Merge branch 'routing'

Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php

7 files changed, 0 insertions, 9 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..0fa162fb371 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -18,7 +18,6 @@
 * 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();
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 81fa06dbf19..8d31275dbfb 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -14,7 +14,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 $category = isset($_GET['category'])?strip_tags($_GET['category']):null;
 $app = isset($_GET['app'])?$_GET['app']:null;
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index cd46a25b79d..74b0220870c 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -15,7 +15,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 $app = isset($_POST['app'])?$_POST['app']:null;
 $categories = isset($_POST['categories'])?$_POST['categories']:null;
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index a0e67841c55..caeebcaa940 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();
 $app = isset($_GET['app'])?$_GET['app']:null;