From 2408ff06dd1f9a31417a6326256b0b804eabf4aa Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 16 Nov 2010 19:20:49 +0100 Subject: [PATCH] Setup doctype in bootstrap instead of layout. --- application/Bootstrap.php | 4 +++- application/modules/default/views/layout/clean.phtml | 3 +-- application/modules/default/views/layout/default.phtml | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/Bootstrap.php b/application/Bootstrap.php index f466745..a9df6a8 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -63,12 +63,14 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $this->bootstrap('layout'); $view = $this->getResource('layout')->getView(); + + $view->doctype('XHTML1_STRICT'); $view->setEncoding('UTF-8'); + $view->headMeta()->appendHttpEquiv('Content-Type','text/html;charset=utf-8'); // Set site title from application.ini $config = $this->getApplication()->getOptions(); $view->headTitle($config['app']['name']); - $view->headMeta()->appendHttpEquiv('Content-Type','text/html;charset=utf-8'); // Set helper path $view->addHelperPath('Fiktiv/View/Helper/', 'Fiktiv_View_Helper'); diff --git a/application/modules/default/views/layout/clean.phtml b/application/modules/default/views/layout/clean.phtml index 66c9b10..97a6da2 100644 --- a/application/modules/default/views/layout/clean.phtml +++ b/application/modules/default/views/layout/clean.phtml @@ -1,5 +1,4 @@ - +doctype()?> headTitle() . "\n"?> diff --git a/application/modules/default/views/layout/default.phtml b/application/modules/default/views/layout/default.phtml index 0f70afa..9993ffd 100644 --- a/application/modules/default/views/layout/default.phtml +++ b/application/modules/default/views/layout/default.phtml @@ -1,5 +1,4 @@ - +doctype()?> headTitle() . "\n" /* Newline for pretty source :) */ ?>