issue 89 apply patch

double quotes change to single quotes.
Defined by the user be able to add meta tags


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9826 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-11-16 09:25:16 +00:00
parent 3b9e71ea69
commit 5af206c9a7
3 changed files with 68 additions and 23 deletions

View file

@ -63,13 +63,13 @@ class HTMLDisplayHandler {
if(file_exists($edited_layout_css)) Context::loadFile(array($edited_layout_css,'all','',100));
}
if(!$layout_path) $layout_path = "./common/tpl";
if(!$layout_file) $layout_file = "default_layout";
if(!$layout_path) $layout_path = './common/tpl';
if(!$layout_file) $layout_file = 'default_layout';
$output = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
if(__DEBUG__==3) $GLOBALS['__layout_compile_elapsed__'] = getMicroTime()-$start;
if(preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) && (Context::get("_use_ssl")=='optional'||Context::get("_use_ssl")=="always")) {
if(preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always')) {
Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
}
}
@ -138,6 +138,7 @@ class HTMLDisplayHandler {
else
{
$this->_loadJSCSS();
$this->_addMetaTag();
$output = $oTemplate->compile('./common/tpl', 'common_layout');
}
@ -228,4 +229,11 @@ class HTMLDisplayHandler {
}
}
}
function _addMetaTag()
{
$oContext =& Context::getInstance();
$oContext->addMetaTag('Content-Type', 'text/html; charset=UTF-8', true);
$oContext->addMetaTag('imagetoolbar', 'no');
}
}