diff options
| author | blizzz <blizzz@owncloud.com> | 2014-08-21 19:59:31 +0200 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2014-08-21 19:59:31 +0200 |
| commit | 52d5429768acdb87b2dc2efedc89eb4ad0d29139 (patch) | |
| tree | 6ab5900a70361bbf13633e1b1ca7310e08011ee5 /core | |
| parent | 9c980954f4cbb0ff023f5065d64b3eb931914be0 (diff) | |
| parent | ab12bd292d1ac44db427332c265fa58bcf4c3cb4 (diff) | |
| download | nextcloud-server-52d5429768acdb87b2dc2efedc89eb4ad0d29139.tar.gz nextcloud-server-52d5429768acdb87b2dc2efedc89eb4ad0d29139.zip | |
Merge pull request #10522 from owncloud/removeLoadAppScript
Remove loadAppScriptFile
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/update.php | 1 | ||||
| -rw-r--r-- | core/routes.php | 13 |
2 files changed, 2 insertions, 12 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index 627ada080c8..5fca1808891 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -1,6 +1,5 @@ <?php set_time_limit(0); -require_once '../../lib/base.php'; if (OC::checkUpgrade(false)) { $l = new \OC_L10N('core'); diff --git a/core/routes.php b/core/routes.php index d08bd105a14..ff79c450508 100644 --- a/core/routes.php +++ b/core/routes.php @@ -80,7 +80,8 @@ $this->create('core_ajax_preview', '/core/preview') ->actionInclude('core/ajax/preview.php'); $this->create('core_ajax_preview', '/core/preview.png') ->actionInclude('core/ajax/preview.php'); - +$this->create('core_ajax_update', '/core/ajax/update.php') + ->actionInclude('core/ajax/update.php'); // Avatar routes $this->create('core_avatar_get_tmp', '/avatar/tmp') ->get() @@ -98,16 +99,6 @@ $this->create('core_avatar_post_cropped', '/avatar/cropped') ->post() ->action('OC\Core\Avatar\Controller', 'postCroppedAvatar'); -// Not specifically routed -$this->create('app_index_script', '/apps/{app}/') - ->defaults(array('file' => 'index.php')) - //->requirements(array('file' => '.*.php')) - ->action('OC', 'loadAppScriptFile'); -$this->create('app_script', '/apps/{app}/{file}') - ->defaults(array('file' => 'index.php')) - ->requirements(array('file' => '.*.php')) - ->action('OC', 'loadAppScriptFile'); - // used for heartbeat $this->create('heartbeat', '/heartbeat')->action(function(){ // do nothing |