summaryrefslogtreecommitdiff
path: root/lib/tpl
diff options
context:
space:
mode:
authorKlap-in <klapinklapin@gmail.com>2013-06-09 21:22:12 +0200
committerKlap-in <klapinklapin@gmail.com>2013-06-09 21:22:12 +0200
commit9b6fa49c06b538c53c9cf3e404ade82d6c003f79 (patch)
tree68771b589052382f9e4824bf3a4857f5648fdf3d /lib/tpl
parenta38a6f25d7e46f47a8f358bb16c766f5b96dae45 (diff)
parent62765857f84626449d6c53b1a46c462a37e5083a (diff)
downloadrpg-9b6fa49c06b538c53c9cf3e404ade82d6c003f79.tar.gz
rpg-9b6fa49c06b538c53c9cf3e404ade82d6c003f79.tar.bz2
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'lib/tpl')
-rw-r--r--lib/tpl/dokuwiki/detail.php2
-rw-r--r--lib/tpl/dokuwiki/main.php2
-rw-r--r--lib/tpl/dokuwiki/mediamanager.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index a8c5fef8a..d2ed530a3 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -9,12 +9,12 @@
// must be run from within DokuWiki
if (!defined('DOKU_INC')) die();
+header('X-UA-Compatible: IE=edge,chrome=1');
?><!DOCTYPE html>
<html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
<head>
<meta charset="utf-8" />
- <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
<title>
<?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
[<?php echo strip_tags($conf['title'])?>]
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 963750a1c..43a0c0da7 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -9,6 +9,7 @@
*/
if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
+header('X-UA-Compatible: IE=edge,chrome=1');
$hasSidebar = page_findnearest($conf['sidebar']);
$showSidebar = $hasSidebar && ($ACT=='show');
@@ -16,7 +17,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
<html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
<head>
<meta charset="utf-8" />
- <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
<title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title>
<script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
<?php tpl_metaheaders() ?>
diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php
index 23c9cee79..dadf2b10f 100644
--- a/lib/tpl/dokuwiki/mediamanager.php
+++ b/lib/tpl/dokuwiki/mediamanager.php
@@ -7,12 +7,12 @@
*/
// must be run from within DokuWiki
if (!defined('DOKU_INC')) die();
+header('X-UA-Compatible: IE=edge,chrome=1');
?><!DOCTYPE html>
<html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="popup no-js">
<head>
<meta charset="utf-8" />
- <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
<title>
<?php echo hsc($lang['mediaselect'])?>
[<?php echo strip_tags($conf['title'])?>]