1
0

re-added 2.0 Smartification needs, which got lost by up-port

This commit is contained in:
Ian
2012-06-13 16:17:11 +02:00
parent 74a9d3b31a
commit 4d9fa16b1e

View File

@@ -1,4 +1,4 @@
<?php // (experimental) serendipity_smarty_class.inc.php 2012-01-03 14:11 Ian
<?php // (experimental) serendipity_smarty_class.inc.php 2012-06-13 16:09 Ian
// define secure_dir and trusted_dirs for Serendipity_Smarty_Security_Policy class.
@define('S9Y_TEMPLATE_FALLBACK', $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default');
@@ -148,7 +148,7 @@ class Serendipity_Smarty extends Smarty
$this->setConfigDir(array(S9Y_TEMPLATE_USERDEFAULT));
if (!is_dir($this->getCompileDir()) || !is_writable($this->getCompileDir())) {
if ( ( !is_dir($this->getCompileDir()) || !is_writable($this->getCompileDir()) ) && IN_installer !== true) {
if(ini_get('display_errors') == 0 || ini_get('display_errors') == 'off') printf(DIRECTORY_WRITE_ERROR, $this->getCompileDir());
trigger_error(sprintf(DIRECTORY_WRITE_ERROR, $this->getCompileDir()), E_USER_ERROR);
}
@@ -311,6 +311,8 @@ class Serendipity_Smarty extends Smarty
// set smarty error reporting. General error_reporting is set in serendipity/serendipity_config.inc.php
$this->error_reporting = E_ALL & ~E_NOTICE ^ E_STRICT;
// we use our own error_handler and get in conflicts with smarty?
#$this->muteExpectedErrors();
}
/*