summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-07-07 19:36:41 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-07-07 19:36:41 +0200
commitb2377129b6b51685010fc80f1410c6152ee9b7e5 (patch)
tree95b478b31f52f28290c4f317b21b5318d7d3feb2 /lib/private
parented9b9ba671131e356938627e6344064f190f5313 (diff)
parentbef093471933e434cafba69f1e50ad5308da6dd2 (diff)
downloadnextcloud-server-b2377129b6b51685010fc80f1410c6152ee9b7e5.tar.gz
nextcloud-server-b2377129b6b51685010fc80f1410c6152ee9b7e5.zip
Merge pull request #9494 from owncloud/issue/9490
[issues/9490] \OC::$WEBROOT is invalid when called from cron.php
Diffstat (limited to 'lib/private')
-rwxr-xr-xlib/private/request.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/request.php b/lib/private/request.php
index 619eae3e9b5..5fd5b3a7197 100755
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -95,7 +95,7 @@ class OC_Request {
* reverse proxies
*/
public static function serverHost() {
- if(OC::$CLI) {
+ if (OC::$CLI && defined('PHPUNIT_RUN')) {
return 'localhost';
}