Commit: d82def10cf5f997425492b8484b43622ca33df8e - pukiwiki-fork (git)

Commit MetaInfo

• Revisión: d82def10cf5f997425492b8484b43622ca33df8e (tree)
• Tiempo: 2019-03-29 10:30:39
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2487 READONLY - Link only existing pages in topicpath title

Cambiar Resumen

• modified: lib/html.php
• modified: plugin/topicpath.inc.php
• modified: skin/main.js

Diferencia incremental

--- a/lib/html.php
+++ b/lib/html.php
@@ -303,7 +303,8 @@ EOS;
 	}
 	// Topicpath title
 	$topicpath_data = '';
-	if ($topicpath_title && exist_plugin('topicpath')) {
+	if ($topicpath_title && exist_plugin('topicpath') &&
+		function_exists('plugin_topicpath_parent_links')) {
 		$parents = plugin_topicpath_parent_links($page);
 		$h_topicpath = htmlsc_json($parents);
 		$topicpath_data = <<<EOS

--- a/plugin/topicpath.inc.php
+++ b/plugin/topicpath.inc.php
@@ -32,6 +32,26 @@ function plugin_topicpath_convert()
 
 function plugin_topicpath_parent_links($page)
 {
+	$links = plugin_topicpath_parent_all_links($page);
+	if (PKWK_READONLY) {
+		$active_links = array();
+		foreach ($links as $link) {
+			if (is_page($link['page'])) {
+				$active_links[] = $link;
+			} else {
+				$active_links[] = array(
+					'page' => $link['page'],
+					'leaf' => $link['leaf'],
+				);
+			}
+		}
+		return $active_links;
+	}
+	return $links;
+}
+
+function plugin_topicpath_parent_all_links($page)
+{
 	$parts = explode('/', $page);
 	$parents = array();
 	for ($i = 0, $pos = 0; $pos = strpos($page, '/', $i); $i = $pos + 1) {
@@ -50,7 +70,7 @@ function plugin_topicpath_inline()
 	global $vars, $defaultpage;
 	$page = isset($vars['page']) ? $vars['page'] : '';
 	if ($page == '' || $page == $defaultpage) return '';
-	$parents = plugin_topicpath_parent_links($page);
+	$parents = plugin_topicpath_parent_all_links($page);
 	$topic_path = array();
 	foreach ($parents as $p) {
 		if (PKWK_READONLY && !is_page($p['page'])) {

--- a/skin/main.js
+++ b/skin/main.js
@@ -583,11 +583,17 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
     var fragment = document.createDocumentFragment();
     for (var i = 0, n = topicpathLinks.length; i < n; i++) {
       var path = topicpathLinks[i];
-      var a1 = document.createElement('a');
-      a1.setAttribute('href', path.uri);
-      a1.setAttribute('title', path.page);
-      a1.textContent = path.leaf;
-      fragment.appendChild(a1);
+      if (path.uri) {
+        var a1 = document.createElement('a');
+        a1.setAttribute('href', path.uri);
+        a1.setAttribute('title', path.page);
+        a1.textContent = path.leaf;
+        fragment.appendChild(a1);
+      } else {
+        var s1 = document.createElement('span');
+        s1.textContent = path.leaf;
+        fragment.appendChild(s1);
+      }
       var span = document.createElement('span');
       span.className = 'topicpath-slash';
       span.textContent = '/';