Skip to content
Snippets Groups Projects
Commit 564f2647 authored by Lukas Reschke's avatar Lukas Reschke
Browse files

Merge pull request #3290 from owncloud/config-data 

Move config data to template
parents 74f92d0c 337e3ed6
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
core/js/config.php
+ 3
− 3
View file @ 564f2647
......@@ -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(
......
core/templates/layout.user.php
+ 1
− 1
View file @ 564f2647
......@@ -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" />
......
lib/templatelayout.php
+ 1
− 1
View file @ 564f2647
......@@ -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);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment