diff options
author | Brice Maron <brice@bmaron.net> | 2012-06-21 21:15:35 +0400 |
---|---|---|
committer | Brice Maron <brice@bmaron.net> | 2012-06-21 21:15:35 +0400 |
commit | c1046e69224b74a36bfc68c4b73330f2a9bf8332 (patch) | |
tree | 4b0289d9fe74754df1d86d436b19a905ff15db21 /user_webfinger | |
parent | 5e949d7e544934ebdc5018a80f28ebfa483d8256 (diff) | |
parent | d1b88ba4496887ff3a5c327109106f155f78f3a9 (diff) |
Merge branch 'master' into multi_app_dir
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
Diffstat (limited to 'user_webfinger')
-rw-r--r-- | user_webfinger/webfinger.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/user_webfinger/webfinger.php b/user_webfinger/webfinger.php index 67cbba54a..6b64a7e28 100644 --- a/user_webfinger/webfinger.php +++ b/user_webfinger/webfinger.php @@ -17,13 +17,6 @@ header("Content-Type: application/xrd+json"); * '* but can also use complex database queries to generate the webfinger result **/ -// calculate the documentroot -// modified version of the one in lib/base.php that takes the .well-known symlink into account -/*$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']); -$SERVERROOT=str_replace("\\",'/',dirname(dirname(dirname(dirname(__FILE__))))); -$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT)); -$WEBROOT=substr($SUBURI,0,-34); -*/ $userName = ''; $hostName = ''; |