Item14428: don't block other plugin's renderWikiWordHandler

added "TopicTitleEnabled" context for newer NatEditPlugin
foswiki · Dec 12, 2017 · 21836bf · 21836bf
1 parent b0887fa
commit 21836bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/data/System/DBCachePlugin.txt b/data/System/DBCachePlugin.txt
@@ -454,6 +454,7 @@ automatically from there on.
 ---++ Change History
 
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  12 Dec 2017: | only set the link text of !WikiWords if there actually _is_ a !TopicTitle for it; set the =TopicTitleEnabled= context for natedit |
 |  28 Jul 2017: | fixed restricted search; added random sorting of search results; performance improvements re-loading cache files; fixed "Can't use string as a HASH ref"; added =length()= function to formating | 
 |  16 Jan 2017: | oo-ify core and other code cleanup |
 |  11 Jul 2016: | make use of clean-up feature of latest <nop>DBCacheContrib; performance improvements |

diff --git a/lib/Foswiki/Plugins/DBCachePlugin.pm b/lib/Foswiki/Plugins/DBCachePlugin.pm
@@ -25,8 +25,8 @@ use Foswiki::Plugins();
 #Monitor::MonitorMethod('Foswiki::Contrib::DBCachePlugin::Core');
 #Monitor::MonitorMethod('Foswiki::Contrib::DBCachePlugin::WebDB');
 
-our $VERSION = '10.10';
-our $RELEASE = '29 Jul 2017';
+our $VERSION = '10.20';
+our $RELEASE = '12 Dec 2017';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION = 'Lightweighted frontend to the <nop>DBCacheContrib';
 
@@ -104,6 +104,9 @@ sub initPlugin {
   @isEnabledSaveHandler = ();
   @isEnabledRenameHandler = ();
 
+  # this plugin handles TopicTitles
+  Foswiki::Func::getContext()->{TopicTitleEnabled} = 1;
+
   return 1;
 }
 

diff --git a/lib/Foswiki/Plugins/DBCachePlugin/Core.pm b/lib/Foswiki/Plugins/DBCachePlugin/Core.pm
@@ -95,9 +95,8 @@ sub renderWikiWordHandler {
 
   #_writeDebug("topicTitle=$topicTitle");
 
-  $theLinkText = $topicTitle if $topicTitle;
-
-  return $theLinkText;
+  return unless defined($topicTitle) && $topicTitle ne $theTopic;
+  return $topicTitle;
 }
 
 ###############################################################################