diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-27 18:23:00 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-27 18:23:00 +0200 |
| commit | 6670d3765881a1a7579bd96a523a90c2a52aec4a (patch) | |
| tree | 4251976f5699d7b9e0b1b0aa42b3a5baca5432b5 /core/templates | |
| parent | cee2f5dc65f743e0e6470e852978d8bb8e346012 (diff) | |
| parent | f8fa031e9f81ba052930d2de647d997af3c309c6 (diff) | |
| download | nextcloud-server-6670d3765881a1a7579bd96a523a90c2a52aec4a.tar.gz nextcloud-server-6670d3765881a1a7579bd96a523a90c2a52aec4a.zip | |
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.base.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 29c2ca6696d..7301ae690cc 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -1,7 +1,5 @@ <!DOCTYPE html> -<!--[if lte IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> +<html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" > <head data-requesttoken="<?php p($_['requesttoken']); ?>"> <meta charset="utf-8"> <title> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 3f9c47f9aa6..985e95294ad 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -1,7 +1,5 @@ <!DOCTYPE html> -<!--[if lte IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> +<html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" > <head data-requesttoken="<?php p($_['requesttoken']); ?>"> <meta charset="utf-8"> <title> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d762bd9897a..d42a392f40f 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -1,7 +1,5 @@ <!DOCTYPE html> -<!--[if lte IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> +<html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" > <head data-user="<?php p($_['user_uid']); ?>" data-user-displayname="<?php p($_['user_displayname']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <meta charset="utf-8"> <title> |