[Pkg-owncloud-commits] [owncloud] 33/70: Only overwrite serverHost when in unit tests

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit f5e4ebf2bac0ac31d3bf0388c7ea607aeedc2f35
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Mon Jul 7 14:39:06 2014 +0200

    Only overwrite serverHost when in unit tests
    
    The intention of the original commit 12f7cb87679453fa96c796df857b7e7193d4ee09
    was to fix tests. But cron should always return a valid host not localhost.
---
 lib/private/request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/request.php b/lib/private/request.php
index 619eae3..5fd5b3a 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';
 		}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git