BugTrack/2496 Remove tailing "?" in unexisting page link

[pukiwiki/pukiwiki.git] / lib / html.php

diff --git a/lib/html.php b/lib/html.php
index f13009d..f0d5c8a 100644 (file)
--- a/lib/html.php
+++ b/lib/html.php
@@ -559,13 +559,18 @@ function strip_htmltag($str, $all = TRUE)
        global $_symbol_noexists;
        static $noexists_pattern;
 
-       if (! isset($noexists_pattern))
-               $noexists_pattern = '#<span class="noexists">([^<]*)<a[^>]+>' .
-                       preg_quote($_symbol_noexists, '#') . '</a></span>#';
-
-       // Strip Dagnling-Link decoration (Tags and "$_symbol_noexists")
-       $str = preg_replace($noexists_pattern, '$1', $str);
-
+       if (! isset($noexists_pattern)) {
+               if ($_symbol_noexists != '') {
+                       $noexists_pattern = '#<span class="noexists">([^<]*)<a[^>]+>' .
+                               preg_quote($_symbol_noexists, '#') . '</a></span>#';
+               } else {
+                       $noexists_pattern = '';
+               }
+       }
+       if ($noexists_pattern != '') {
+               // Strip Dagnling-Link decoration (Tags and "$_symbol_noexists")
+               $str = preg_replace($noexists_pattern, '$1', $str);
+       }
        if ($all) {
                // All other HTML tags
                return preg_replace('#<[^>]+>#',        '', $str);