From 2fcf6314278d4f1d3fe1af02e622a2b2c4134c2d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 19 Dec 2009 08:50:44 +0000
Subject: [PATCH] Rewrites/fixes

---
 inc/filters.php                          | 2 +-
 inc/modules/admin/what-usage.php         | 2 +-
 inc/modules/guest/what-agb.php           | 2 +-
 inc/modules/guest/what-wernis_portal.php | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/filters.php b/inc/filters.php
index 4b16afc996..2534b158f0 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -450,7 +450,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
 	preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $code, $matches);
 	//* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
 
-	// Default is from OUTPUT_HTML
+	// Default is from outputHtml()
 	$outputMode = getOutputMode();
 
 	// Some entries found?
diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index b693fd86c8..718ec0adf6 100644
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -84,7 +84,7 @@ if (isGetRequestParameterSet('image')) {
 }
 
 if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
-	// @TODO This code is double, see LOAD_TEMPLATE and loadEmailTemplate in functions.php
+	// @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
 	eval("\$content=\"".SQL_ESCAPE(readFromFile($FQFN))."\";");
 	// Until here...
 
diff --git a/inc/modules/guest/what-agb.php b/inc/modules/guest/what-agb.php
index ddf66c2785..37870ac941 100644
--- a/inc/modules/guest/what-agb.php
+++ b/inc/modules/guest/what-agb.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', basename(__FILE__));
+addMenuDescription('guest', __FILE__);
 
 // Load default template
 loadTemplate(substr(basename(__FILE__), 5, -4));
diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index b19dc24d22..6a959b4be1 100644
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -54,6 +54,7 @@ if ((!isExtensionActive('wernis')) && (!isAdmin())) {
 
 outputHtml('<div style="padding-left: 10px; padding-right: 10px">');
 $rdf = new fase4_rdf();
+$rdf->_use_nl2br = false;
 $rdf->use_dynamic_display(false);
 $rdf->set_CacheDir(getConfig('CACHE_PATH') . '');
 $rdf->set_salt(md5(getConfig('SITE_KEY')));
-- 
2.39.5