Rewrites/fixes

diff --git a/inc/filters.php b/inc/filters.php
index 4b16afc996283990a5da94df0b5039fe9b172e6a..2534b158f0ba8d011fe606f4ea2a8fc55c987df8 100644 (file)
--- 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 b693fd86c89ec9828e51180767d94fd8082d814c..718ec0adf604ec25707f19886b8ecc41f5e0dc5b 100644 (file)
--- 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 ddf66c27854f3f7075cc2fd9a8450f9e6d1ea37c..37870ac941c60a57ca816c530e0e5d3468fd8728 100644 (file)
--- 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 b19dc24d2227ba89d41ed1fd4ad237a7c804331c..6a959b4be1d690b421e17886f355c01ccf6e4400 100644 (file)
--- 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')));