diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-05-12 02:40:30 -0700 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-05-12 02:40:30 -0700 |
| commit | 564f26475c13bb7c6a2432204b5f60015188e6e4 (patch) | |
| tree | 6adf79fbcb32147c6532d989e0896ed616316566 | |
| parent | 74f92d0c7fa1afa181837a9e827933769816ecbb (diff) | |
| parent | 337e3ed61fc50d1d69b6f481777e58c3f9a428fd (diff) | |
| download | nextcloud-server-564f26475c13bb7c6a2432204b5f60015188e6e4.tar.gz nextcloud-server-564f26475c13bb7c6a2432204b5f60015188e6e4.zip | |
Merge pull request #3290 from owncloud/config-data
Move config data to template
| -rw-r--r-- | core/js/config.php | 6 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | lib/templatelayout.php | 2 |
3 files changed, 5 insertions, 5 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 diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 4dc4a2c7593..6e49149b0ae 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -5,7 +5,7 @@ <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]--> <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <head> + <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <title><?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud <?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> diff --git a/lib/templatelayout.php b/lib/templatelayout.php index d385bb7f19d..7115b8f0306 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -56,7 +56,7 @@ class OC_TemplateLayout extends OC_Template { $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); $this->assign('jsfiles', array(), false); if (OC_Config::getValue('installed', false) && $renderas!='error') { - $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config')); + $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter); } if (!empty(OC_Util::$core_scripts)) { $this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter); |