From: garvinhicking <garvinhicking>
Date: Sat, 29 Apr 2006 23:11:56 +0000 (+0000)
Subject: Fix template configurator
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d0253cf657503d27012dc41d976e5a768c9869ab;p=s9y.git

Fix template configurator
---

diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index cc0ec53..d4f7c07 100644
--- 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 8b18642..c676097 100644
--- 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/');