Fix template configurator

diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index cc0ec53daa6d61aa177ecd761b5ff09eb03a05fe..d4f7c07058d7e83fe3e4fce0cab4407c15b24039 100644 (file)
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -1089,7 +1089,7 @@ function serendipity_updertEntry($entry) {
     }
 
     /* WYSIWYG-editor inserts empty ' ' for extended body; this is reversed here */
-    if (isset($entry['extended']) && (trim($entry['extended']) == '' || trim($entry['extended']) == '<br />' || trim($entry['extended']) == '<p></p>')) {
+    if (isset($entry['extended']) && (trim($entry['extended']) == '' || trim($entry['extended']) == '<br />' || trim($entry['extended']) == '<p></p>' || str_replace(array("\r", "\n", "\t", "\0", "<br />", "<p>", "</p>", "<br>"), array('', '', '', '', '', '', '', ''), trim($entry['extended'])))) {
         $entry['extended'] = '';
     }
 

diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
index 8b186420abcc2661bc126a5941542e8f4e738e03..c676097cee1360f3e2c211f3bff248f1738694ff 100644 (file)
--- a/include/functions_smarty.inc.php
+++ b/include/functions_smarty.inc.php
@@ -613,7 +613,7 @@ function &serendipity_replaceSmartyVars(&$tpl_source, &$smarty) {
  * @return null
  */
 function serendipity_smarty_init($vars = array()) {
-    global $serendipity;
+    global $serendipity, $template_config;
 
     if (!isset($serendipity['smarty'])) {
         @define('SMARTY_DIR', S9Y_PEAR_PATH . 'Smarty/libs/');