[phpwiki-checkins] SF.net SVN: phpwiki:[10381] trunk

[<var...@us...>]

Revision: 10381
          http://sourceforge.net/p/phpwiki/code/10381
Author:   vargenau
Date:     2021-07-28 14:45:17 +0000 (Wed, 28 Jul 2021)
Log Message:
-----------
function pageLink: same prototype as base class

Modified Paths:
--------------
    trunk/lib/plugin/PageHistory.php
    trunk/lib/plugin/RecentChanges.php
    trunk/themes/blog/lib/RecentChanges.php

Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2021-07-28 14:29:15 UTC (rev 10380)
+++ trunk/lib/plugin/PageHistory.php	2021-07-28 14:45:17 UTC (rev 10381)
@@ -178,7 +178,7 @@
             'value' => $rev->getVersion()));
     }
 
-    function pageLink($rev, $link_text = false)
+    function pageLink($rev, $link_text = '')
     {
         $text = fmt("Version %d", $rev->getVersion());
         return _RecentChanges_HtmlFormatter::pageLink($rev, $text);

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2021-07-28 14:29:15 UTC (rev 10380)
+++ trunk/lib/plugin/RecentChanges.php	2021-07-28 14:45:17 UTC (rev 10381)
@@ -193,7 +193,6 @@
 
     function pageLink($rev, $link_text = '')
     {
-
         return WikiLink($this->include_versions_in_URLs() ? $rev : $rev->getPage(),
             'auto', $link_text);
         /*
@@ -677,7 +676,7 @@
         return $linkurl;
     }
 
-    function pageLink($rev, $link_text = false)
+    function pageLink($rev, $link_text = '')
     {
         $linkurl = parent::pageLink($rev);
         $linkurl->setAttr('target', '_content');

Modified: trunk/themes/blog/lib/RecentChanges.php
===================================================================
--- trunk/themes/blog/lib/RecentChanges.php	2021-07-28 14:29:15 UTC (rev 10380)
+++ trunk/themes/blog/lib/RecentChanges.php	2021-07-28 14:45:17 UTC (rev 10381)
@@ -31,7 +31,7 @@
 class _blog_RecentChanges_BoxFormatter
     extends _RecentChanges_BoxFormatter
 {
-    function pageLink(&$rev, $link_text = false)
+    function pageLink($rev, $link_text = '')
     {
         if (!$link_text and $rev->get('pagetype') == 'wikiblog')
             $link_text = $rev->get('summary');
@@ -46,7 +46,7 @@
 class _blog_RecentChanges_Formatter
     extends _RecentChanges_HtmlFormatter
 {
-    function pageLink(&$rev, $link_text = false)
+    function pageLink($rev, $link_text = '')
     {
         if (!$link_text and $rev->get('pagetype') == 'wikiblog')
             $link_text = $rev->get('summary');
@@ -53,14 +53,3 @@
         return WikiLink($rev, 'auto', $link_text);
     }
 }
-/*
-class _blog_PageHistory_Formatter
-extends _PageHistory_HtmlFormatter
-{
-    function pageLink (&$rev, $link_text=false) {
-        if (!$link_text and $rev->get('pagetype') == 'wikiblog')
-            $link_text = $rev->get('summary');
-        return WikiLink($rev,'auto',$link_text);
-    }
-}
-*/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.