Commit: c3d7f1c01d1dfd0482e72d7f579e73a2fd97c85b - pukiwiki-fork (git)

Commit MetaInfo

• Révision: c3d7f1c01d1dfd0482e72d7f579e73a2fd97c85b (tree)
• l'heure: 2020-02-08 20:06:10
• Auteur: umorigu <umorigu@gmai...>
• Commiter: umorigu

Message de Log

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

Enable to click page name on un existing page.
Compatibility: Set $_symbol_noexists = '?' to use previous behavior.

Change Summary

• modified: en.lng.php
• modified: ja.lng.php
• modified: lib/html.php
• modified: lib/make_link.php
• modified: plugin/yetlist.inc.php

Modification

--- a/en.lng.php
+++ b/en.lng.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // en.lng.php
 // Copyright
-//   2002-2018 PukiWiki Development Team
+//   2002-2020 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -65,7 +65,7 @@ $_msg_edit_unloadbefore_message = 'Data you have entered will not be saved.';
 ///////////////////////////////////////
 // Symbols
 $_symbol_anchor   = '†';
-$_symbol_noexists = '?';
+$_symbol_noexists = '';
 
 ///////////////////////////////////////
 // Form buttons

--- a/ja.lng.php
+++ b/ja.lng.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // ja.lng.php
 // Copyright
-//   2002-2018 PukiWiki Development Team
+//   2002-2020 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -67,7 +67,7 @@ $_msg_edit_unloadbefore_message = '入力したデータは保存されません
 ///////////////////////////////////////
 // Symbols
 $_symbol_anchor   = '†';
-$_symbol_noexists = '?';
+$_symbol_noexists = '';
 
 ///////////////////////////////////////
 // Form buttons

--- 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);

--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // make_link.php
 // Copyright
-//   2003-2019 PukiWiki Development Team
+//   2003-2020 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -811,15 +811,18 @@ function make_pagelink($page, $alias = '', $anchor = '', $refer = '', $isautolin
 		}
 		// Dangling link
 		if (PKWK_READONLY) return $s_alias; // No dacorations
-
-		$retval = $s_alias . '<a href="' .
-			$script . '?cmd=edit&amp;page=' . $r_page . $r_refer . '">' .
-			$_symbol_noexists . '</a>';
-
-		if ($link_compact) {
+		$symbol_html = '';
+		if ($_symbol_noexists !== '') {
+			$symbol_html = '<span style="user-select:none;">' .
+				htmlsc($_symbol_noexists) . '</span>';
+		}
+		$href = $script . '?cmd=edit&amp;page=' . $r_page . $r_refer;
+		if ($link_compact && $_symbol_noexists != '') {
+			$retval = '<a href="' . $href . '">' . $_symbol_noexists . '</a>';
 			return $retval;
 		} else {
-			return '<span class="noexists">' . $retval . '</span>';
+			$retval = '<a href="' . $href . '">' . $s_alias . '</a>';
+			return '<span class="noexists">' . $retval . $symbol_html . '</span>';
 		}
 	}
 }

--- a/plugin/yetlist.inc.php
+++ b/plugin/yetlist.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
 // yetlist.inc.php
-// Copyright 2001-2017 PukiWiki Development Team
+// Copyright 2001-2020 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Yet list plugin - Show a list of dangling links (not yet created)
@@ -54,10 +54,15 @@ function plugin_yetlist_action()
 				$href = $s_page;
 			} else {
 				// Dangling link
-				$href = '<span class="noexists">' . $s_page . '<a href="' .
+				$symbol_html = '';
+				if ($_symbol_noexists !== '') {
+					$symbol_html = '<span style="user-select:none;">' .
+						htmlsc($_symbol_noexists) . '</span>';
+				}
+				$href = '<span class="noexists"><a href="' .
 					$script . '?cmd=edit&amp;page=' . rawurlencode($page) .
-					'&amp;refer=' . $r_refer . '">' . $_symbol_noexists .
-					'</a></span>';
+					'&amp;refer=' . $r_refer . '">' . $s_page .
+					'</a>' . $symbol_html . '</span>';
 			}
 			$retval['body'] .= '<li>' . $href . ' <em>(' . $link_ref . ')</em></li>' . "\n";
 		}