diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-05-12 02:40:30 -0700 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-05-12 11:41:42 +0200 |
| commit | 9a53d50e169a797f95c16cb75aa1bcafd7513c76 (patch) | |
| tree | 44edee4a65da58d1b1b22bcf21460a6ed5884a5c /core/js | |
| parent | bc767f18991c7cffa55cbff694298f27afa3b821 (diff) | |
| download | nextcloud-server-9a53d50e169a797f95c16cb75aa1bcafd7513c76.tar.gz nextcloud-server-9a53d50e169a797f95c16cb75aa1bcafd7513c76.zip | |
Merge pull request #3290 from owncloud/config-data
Move config data to template
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/config.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/config.php b/core/js/config.php index 0aaa4482287..48bea6ae542 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -26,8 +26,8 @@ $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" => "\"".OC_User::getUser(). "\"", - "oc_requesttoken" => "\"".OC_Util::callRegister(). "\"", + "oc_current_user" => "document.head.getAttribute('data-user')", + "oc_requesttoken" => "document.head.getAttribute('data-requesttoken')", "datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')), "dayNames" => json_encode( array( @@ -62,4 +62,4 @@ $array = array( // Echo it foreach ($array as $setting => $value) { echo("var ". $setting ."=".$value.";\n"); -} +}
\ No newline at end of file |