diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-21 17:05:08 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-21 17:05:08 +0400 |
| commit | 6ff96b34ad0462ad05c34633ccd08236b93bf195 (patch) | |
| tree | 1acd7eb869d512b5a3fc9502961a98591ea20cfa /remote.php | |
| parent | e139f7c863d5971a6386070148496cb0f70ad04e (diff) | |
| parent | 37af74efb3e3511b2d6eacef67dc90f22a685bd3 (diff) | |
Merge branch 'master' into load-apps-proper-master
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
Diffstat (limited to 'remote.php')
| -rw-r--r-- | remote.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/remote.php b/remote.php index d25bbdb6e7e..15dfa8256ff 100644 --- a/remote.php +++ b/remote.php @@ -13,7 +13,7 @@ try { } $service=substr($path_info, 1, $pos-1); - $file = OC_AppConfig::getValue('core', 'remote_' . $service); + $file = \OC::$server->getAppConfig()->getValue('core', 'remote_' . $service); if(is_null($file)) { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); @@ -31,11 +31,7 @@ try { default: OC_Util::checkAppEnabled($app); OC_App::loadApp($app); - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - $file = OC_App::getAppPath($app) .'/'. $parts[1]; - }else{ - $file = '/' . OC_App::getAppPath($app) .'/'. $parts[1]; - } + $file = OC_App::getAppPath($app) .'/'. $parts[1]; break; } $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/'; |