diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-06-26 13:23:21 +0400 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-06-26 20:59:37 +0400 |
| commit | 498bb50597ac382e72e08328785e2a4e2a6b9968 (patch) | |
| tree | 21efcbb7f2bd2078a22bf66430f9951434a28758 /core | |
| parent | 07a5914dc448b6f210ffe99b341d1d35b04bf11f (diff) | |
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/config.php | 2 | ||||
| -rw-r--r-- | core/js/js.js | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/js/config.php b/core/js/config.php index 53a8fb96388..dd46f7889d1 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -26,8 +26,6 @@ $array = array( "oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false', "oc_webroot" => "\"".OC::$WEBROOT."\"", "oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution - "oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')", - "oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')", "datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')), "dayNames" => json_encode( array( diff --git a/core/js/js.js b/core/js/js.js index 1a94215c27b..bfc9396ff2d 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -7,7 +7,10 @@ */ var oc_debug; var oc_webroot; -var oc_requesttoken; + +var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('data-user'); +var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken'); + if (typeof oc_webroot === "undefined") { oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/')); } |