phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[10250] trunk/lib/plugin/AuthorHistory.php

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

Revision: 10250
          http://sourceforge.net/p/phpwiki/code/10250
Author:   vargenau
Date:     2021-02-22 12:38:19 +0000 (Mon, 22 Feb 2021)
Log Message:
-----------
plugin AuthorHistory: better test boolean arguments "noheader", "includeminor" and "includedeleted"

Modified Paths:
--------------
    trunk/lib/plugin/AuthorHistory.php

Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2021-02-22 12:28:09 UTC (rev 10249)
+++ trunk/lib/plugin/AuthorHistory.php	2021-02-22 12:38:19 UTC (rev 10250)
@@ -30,13 +30,13 @@
 
  try this in a page called AuthorHistory:
 
-<?plugin AuthorHistory page=username includeminor=true ?>
+<<AuthorHistory page=username includeminor=true >>
 ----
-<?plugin AuthorHistory page=all ?>
+<<AuthorHistory page=all >>
 
  try this in a subpage of your UserName: (UserName/AuthorHistory)
 
-<?plugin AuthorHistory page=all includeminor=true ?>
+<<AuthorHistory page=all includeminor=true >>
 
 * Display a list of revision edits by one particular user, for the
 * current page, a specified page, or all pages.
@@ -49,13 +49,6 @@
 
 */
 
-/*
- reference
- _PageHistory_PageRevisionIter
- WikiDB_PageIterator(&$wikidb, &$pages
- WikiDB_PageRevisionIterator(&$wikidb, &$revisions)
-*/
-
 require_once 'lib/PageList.php';
 
 class WikiPlugin_AuthorHistory
@@ -96,6 +89,31 @@
     {
         $this->_args = $this->getArgs($argstr, $request);
         extract($this->_args);
+
+        if (($noheader == '0') || ($noheader == 'false')) {
+            $noheader = false;
+        } elseif (($noheader == '1') || ($noheader == 'true')) {
+            $noheader = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader"));
+        }
+
+        if (($includeminor == '0') || ($includeminor == 'false')) {
+            $includeminor = false;
+        } elseif (($includeminor == '1') || ($includeminor == 'true')) {
+            $includeminor = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "includeminor"));
+        }
+
+        if (($includedeleted == '0') || ($includedeleted == 'false')) {
+            $includedeleted = false;
+        } elseif (($includedeleted == '1') || ($includedeleted == 'true')) {
+            $includedeleted = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "includedeleted"));
+        }
+
         if ($page && $page == 'username') //FIXME: use [username]!!!!!
             $page = $author;
         if (!$page || !$author) //user not signed in or no author specified

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10249] trunk/lib/plugin/AtomFeed.php

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

Revision: 10249
          http://sourceforge.net/p/phpwiki/code/10249
Author:   vargenau
Date:     2021-02-22 12:28:09 +0000 (Mon, 22 Feb 2021)
Log Message:
-----------
plugin AtomFeed: better test boolean argument "titleonly"

Modified Paths:
--------------
    trunk/lib/plugin/AtomFeed.php

Modified: trunk/lib/plugin/AtomFeed.php
===================================================================
--- trunk/lib/plugin/AtomFeed.php	2021-02-22 12:21:40 UTC (rev 10248)
+++ trunk/lib/plugin/AtomFeed.php	2021-02-22 12:28:09 UTC (rev 10249)
@@ -58,6 +58,15 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         extract($this->getArgs($argstr, $request));
+
+        if (($titleonly == '0') || ($titleonly == 'false')) {
+            $titleonly = false;
+        } elseif (($titleonly == '1') || ($titleonly == 'true')) {
+            $titleonly = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "titleonly"));
+        }
+
         $parser = new AtomParser();
 
         assert(!empty($url));

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

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

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

Revision: 10248
          http://sourceforge.net/p/phpwiki/code/10248
Author:   vargenau
Date:     2021-02-22 12:21:40 +0000 (Mon, 22 Feb 2021)
Log Message:
-----------
plugin RandomPage: better test boolean arguments "redirect" and "hidename"

Modified Paths:
--------------
    trunk/lib/plugin/RandomPage.php
    trunk/pgsrc/Help%2FRandomPagePlugin

Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php	2021-02-22 12:18:57 UTC (rev 10247)
+++ trunk/lib/plugin/RandomPage.php	2021-02-22 12:21:40 UTC (rev 10248)
@@ -63,6 +63,22 @@
         $args = $this->getArgs($argstr, $request);
         extract($args);
 
+        if (($redirect == '0') || ($redirect == 'false')) {
+            $redirect = false;
+        } elseif (($redirect == '1') || ($redirect == 'true')) {
+            $redirect = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "redirect"));
+        }
+
+        if (($hidename == '0') || ($hidename == 'false')) {
+            $hidename = false;
+        } elseif (($hidename == '1') || ($hidename == 'true')) {
+            $hidename = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "hidename"));
+        }
+
         // Redirect would break HTML dump
         if ($request->getArg('action') != 'browse') {
             return $this->disabled(_("Plugin not run: not in browse mode"));

Modified: trunk/pgsrc/Help%2FRandomPagePlugin
===================================================================
--- trunk/pgsrc/Help%2FRandomPagePlugin	2021-02-22 12:18:57 UTC (rev 10247)
+++ trunk/pgsrc/Help%2FRandomPagePlugin	2021-02-22 12:21:40 UTC (rev 10248)
@@ -1,4 +1,4 @@
-Date: Tue,  9 Apr 2019 14:13:17 +0000
+Date: Mon, 22 Feb 2021 13:05:38 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRandomPagePlugin;
@@ -28,9 +28,13 @@
 | 20
 |-
 | **redirect**
-| Do not display random page link, redirect to random page.
-| empty
+| Boolean. If true, do not display random page link, redirect to random page.
+| false
 |-
+| **hidename**
+| Boolean. If true, hide name (only for numpages=1)
+| false
+|-
 | **exclude**
 | Pages to exclude from random
 | RandomPage, HomePage, AllPages, RecentChanges, RecentEdits, FullRecentChanges

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10247] trunk/lib/plugin/AppendText.php

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

Revision: 10247
          http://sourceforge.net/p/phpwiki/code/10247
Author:   vargenau
Date:     2021-02-22 12:18:57 +0000 (Mon, 22 Feb 2021)
Log Message:
-----------
plugin AppendText: better test boolean argument "redirect"

Modified Paths:
--------------
    trunk/lib/plugin/AppendText.php

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2021-02-21 18:15:37 UTC (rev 10246)
+++ trunk/lib/plugin/AppendText.php	2021-02-22 12:18:57 UTC (rev 10247)
@@ -70,6 +70,16 @@
     {
 
         $args = $this->getArgs($argstr, $request);
+
+        $redirect = $args['redirect'];
+        if (($redirect == '0') || ($redirect == 'false')) {
+            $redirect = false;
+        } elseif (($redirect == '1') || ($redirect == 'true')) {
+            $redirect = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "redirect"));
+        }
+
         if (!$args['pages'] or !$request->isPost()) {
             return $this->work($args['page'], $args, $dbi, $request);
         } else {
@@ -146,7 +156,7 @@
             return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
 
             // The user asked to be redirected to the modified page
-        } elseif ($args['redirect']) {
+        } elseif ($redirect) {
             return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
 
         } else {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10246] trunk/lib/plugin

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

Revision: 10246
          http://sourceforge.net/p/phpwiki/code/10246
Author:   vargenau
Date:     2021-02-21 18:15:37 +0000 (Sun, 21 Feb 2021)
Log Message:
-----------
Better test boolean argument "include_empty"

Modified Paths:
--------------
    trunk/lib/plugin/AllUsers.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/OrphanedPages.php

Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php	2021-02-20 11:23:33 UTC (rev 10245)
+++ trunk/lib/plugin/AllUsers.php	2021-02-21 18:15:37 UTC (rev 10246)
@@ -78,6 +78,14 @@
 
         extract($args);
 
+        if (($include_empty == '0') || ($include_empty == 'false')) {
+            $include_empty = false;
+        } elseif (($include_empty == '1') || ($include_empty == 'true')) {
+            $include_empty = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "include_empty"));
+        }
+
         $group = $request->getGroup();
         if (method_exists($group, '_allUsers')) {
             $allusers = $group->_allUsers();

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2021-02-20 11:23:33 UTC (rev 10245)
+++ trunk/lib/plugin/LinkDatabase.php	2021-02-21 18:15:37 UTC (rev 10246)
@@ -103,6 +103,15 @@
         global $WikiTheme;
         $args = $this->getArgs($argstr, $request);
 
+        $include_empty = $args['include_empty'];
+        if (($include_empty == '0') || ($include_empty == 'false')) {
+            $include_empty = false;
+        } elseif (($include_empty == '1') || ($include_empty == 'true')) {
+            $include_empty = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "include_empty"));
+        }
+
         if (isset($args['limit']) && !is_limit($args['limit'])) {
             return HTML::p(array('class' => "error"),
                            _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
@@ -111,7 +120,7 @@
         $caption = _("All pages with all links in this wiki (%d total):");
 
         if (!empty($args['owner'])) {
-            $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'],
+            $pages = PageList::allPagesByOwner($args['owner'], $include_empty,
                 $args['sortby'], $args['limit']);
             if ($args['owner'])
                 $caption = fmt("List of pages owned by %s (%d total):",
@@ -118,7 +127,7 @@
                     WikiLink($args['owner'], 'if_known'),
                     count($pages));
         } elseif (!empty($args['author'])) {
-            $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'],
+            $pages = PageList::allPagesByAuthor($args['author'], $include_empty,
                 $args['sortby'], $args['limit']);
             if ($args['author'])
                 $caption = fmt("List of pages last edited by %s (%d total):",
@@ -125,7 +134,7 @@
                     WikiLink($args['author'], 'if_known'),
                     count($pages));
         } elseif (!empty($args['creator'])) {
-            $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'],
+            $pages = PageList::allPagesByCreator($args['creator'], $include_empty,
                 $args['sortby'], $args['limit']);
             if ($args['creator'])
                 $caption = fmt("List of pages created by %s (%d total):",
@@ -133,10 +142,10 @@
                     count($pages));
         } else {
             if (!$request->getArg('count'))
-                $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude_from']);
+                $args['count'] = $dbi->numPages($include_empty, $args['exclude_from']);
             else
                 $args['count'] = $request->getArg('count');
-            $pages = $dbi->getAllPages($args['include_empty'], $args['sortby'],
+            $pages = $dbi->getAllPages($include_empty, $args['sortby'],
                 $args['limit'], $args['exclude_from']);
         }
         if ($args['format'] == 'html') {

Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php	2021-02-20 11:23:33 UTC (rev 10245)
+++ trunk/lib/plugin/OrphanedPages.php	2021-02-21 18:15:37 UTC (rev 10246)
@@ -72,6 +72,14 @@
 
         extract($args);
 
+        if (($include_empty == '0') || ($include_empty == 'false')) {
+            $include_empty = false;
+        } elseif (($include_empty == '1') || ($include_empty == 'true')) {
+            $include_empty = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "include_empty"));
+        }
+
         // There's probably a more efficient way to do this (eg a
         // tailored SQL query via the backend, but this does the job
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10245] trunk/lib/plugin

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

Revision: 10245
          http://sourceforge.net/p/phpwiki/code/10245
Author:   vargenau
Date:     2021-02-20 11:23:33 +0000 (Sat, 20 Feb 2021)
Log Message:
-----------
Better test boolean arguments

Modified Paths:
--------------
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/AllPages.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/WikiAdminSetExternal.php

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2021-02-20 11:10:02 UTC (rev 10244)
+++ trunk/lib/plugin/AddComment.php	2021-02-20 11:23:33 UTC (rev 10245)
@@ -61,7 +61,7 @@
         return array('pagename' => '[pagename]',
             'order' => 'normal',
             'mode' => 'add,show',
-            'jshide' => '0',
+            'jshide' => false,
             'noheader' => false,
             //'sortby'     => '-pagename' // oldest first. reverse by order=reverse
         );
@@ -81,6 +81,24 @@
             return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
         }
 
+        $jshide = $args['jshide'];
+        if (($jshide == '0') || ($jshide == 'false')) {
+            $jshide = false;
+        } elseif (($jshide == '1') || ($jshide == 'true')) {
+            $jshide = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "jshide"));
+        }
+
+        $noheader = $args['noheader'];
+        if (($noheader == '0') || ($noheader == 'false')) {
+            $noheader = false;
+        } elseif (($noheader == '1') || ($noheader == 'true')) {
+            $noheader = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader"));
+        }
+
         // Get our form args.
         $comment = $request->getArg("comment");
         $request->setArg('comment', false);
@@ -92,7 +110,7 @@
         // Now we display previous comments and/or provide entry box
         // for new comments
         $html = HTML();
-        if ($args['jshide']) {
+        if ($jshide) {
             $div = HTML::div(array('id' => 'comments', 'style' => 'display:none;'));
             //$list->setAttr('style','display:none;');
             $div->pushContent(JavaScript("

Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2021-02-20 11:10:02 UTC (rev 10244)
+++ trunk/lib/plugin/AllPages.php	2021-02-20 11:23:33 UTC (rev 10245)
@@ -52,7 +52,7 @@
     }
 
     // info arg allows multiple columns
-    // info=mtime,hits,summary,version,author,locked,minor,markup or all
+    // info=mtime,hits,summary,version,author,locked,minor or all
     // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
     // sortby: [+|-] pagename|mtime|hits
 
@@ -67,6 +67,33 @@
     {
         $args = $this->getArgs($argstr, $request);
 
+        $include_empty = $args['include_empty'];
+        if (($include_empty == '0') || ($include_empty == 'false')) {
+            $include_empty = false;
+        } elseif (($include_empty == '1') || ($include_empty == 'true')) {
+            $include_empty = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "include_empty"));
+        }
+
+        $noheader = $args['noheader'];
+        if (($noheader == '0') || ($noheader == 'false')) {
+            $noheader = false;
+        } elseif (($noheader == '1') || ($noheader == 'true')) {
+            $noheader = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader"));
+        }
+
+        $userpages = $args['userpages'];
+        if (($userpages == '0') || ($userpages == 'false')) {
+            $userpages = false;
+        } elseif (($userpages == '1') || ($userpages == 'true')) {
+            $userpages = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "userpages"));
+        }
+
         if (isset($args['limit']) && !is_limit($args['limit'])) {
             return HTML::p(array('class' => "error"),
                            _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
@@ -80,12 +107,12 @@
         // Todo: extend given _GET args
         $caption = _("All pages in this wiki (%d total):");
 
-        if (!empty($args['userpages'])) {
-            $pages = PageList::allUserPages($args['include_empty'], $args['sortby'], '');
+        if ($userpages) {
+            $pages = PageList::allUserPages($include_empty, $args['sortby'], '');
             $caption = _("List of user-created pages (%d total):");
             $args['count'] = count($pages);
         } elseif (!empty($args['owner'])) {
-            $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], $args['sortby'], '');
+            $pages = PageList::allPagesByOwner($args['owner'], $include_empty, $args['sortby'], '');
             $args['count'] = count($pages);
             $caption = fmt("List of pages owned by %s (%d total):",
                 WikiLink($args['owner'] == '[]'
@@ -93,7 +120,7 @@
                         : $args['owner'],
                     'if_known'), $args['count']);
         } elseif (!empty($args['author'])) {
-            $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], $args['sortby'], '');
+            $pages = PageList::allPagesByAuthor($args['author'], $include_empty, $args['sortby'], '');
             $args['count'] = count($pages);
             $caption = fmt("List of pages last edited by %s (%d total):",
                 WikiLink($args['author'] == '[]'
@@ -101,7 +128,7 @@
                         : $args['author'],
                     'if_known'), $args['count']);
         } elseif (!empty($args['creator'])) {
-            $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], $args['sortby'], '');
+            $pages = PageList::allPagesByCreator($args['creator'], $include_empty, $args['sortby'], '');
             $args['count'] = count($pages);
             $caption = fmt("List of pages created by %s (%d total):",
                 WikiLink($args['creator'] == '[]'
@@ -111,24 +138,25 @@
         } elseif ($pages) {
             $args['count'] = count($pages);
         } else {
-            if (!$request->getArg('count'))
-                $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
-            else
+            if (!$request->getArg('count')) {
+                $args['count'] = $dbi->numPages($include_empty, $args['exclude']);
+            } else {
                 $args['count'] = $request->getArg('count');
+            }
         }
         if (empty($args['count']) and !empty($pages)) {
             $args['count'] = count($pages);
         }
         $pagelist = new PageList($args['info'], $args['exclude'], $args);
-        if (!$args['noheader']) {
+        if (!$noheader) {
             $pagelist->setCaption($caption);
         }
 
-        if ($pages !== false)
+        if ($pages !== false) {
             $pagelist->addPageList($pages);
-        else
-            $pagelist->addPages($dbi->getAllPages($args['include_empty'], $args['sortby'],
-                $args['limit']));
+        } else {
+            $pagelist->addPages($dbi->getAllPages($include_empty, $args['sortby'], $args['limit']));
+        }
         return $pagelist;
     }
 }

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2021-02-20 11:10:02 UTC (rev 10244)
+++ trunk/lib/plugin/CreatePage.php	2021-02-20 11:23:33 UTC (rev 10245)
@@ -53,8 +53,6 @@
             'vars' => false,
             'overwrite' => false,
             'verify' => false, // true or a pagename
-            //'buttontext' => false,
-            //'method'     => 'POST'
         );
     }
 
@@ -68,6 +66,15 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         extract($this->getArgs($argstr, $request));
+
+        if (($overwrite == '0') || ($overwrite == 'false')) {
+            $overwrite = false;
+        } elseif (($overwrite == '1') || ($overwrite == 'true')) {
+            $overwrite = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "overwrite"));
+        }
+
         // Prevent spaces at the start and end of a page name
         $s = trim($s);
         if (!$s) {

Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php	2021-02-20 11:10:02 UTC (rev 10244)
+++ trunk/lib/plugin/WikiAdminSetExternal.php	2021-02-20 11:23:33 UTC (rev 10245)
@@ -45,7 +45,7 @@
         (
             parent::getDefaultArguments(),
             array(
-                'external' => 1,
+                'external' => true,
                 /* Columns to include in listing */
                 'info' => 'pagename,external,mtime',
             ));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10244] trunk/pgsrc

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

Revision: 10244
          http://sourceforge.net/p/phpwiki/code/10244
Author:   vargenau
Date:     2021-02-20 11:10:02 +0000 (Sat, 20 Feb 2021)
Log Message:
-----------
pgsrc: improve description of booleans

Modified Paths:
--------------
    trunk/pgsrc/Help%2FAddCommentPlugin
    trunk/pgsrc/Help%2FAllPagesPlugin
    trunk/pgsrc/Help%2FAllUsersPlugin
    trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
    trunk/pgsrc/Help%2FAppendTextPlugin
    trunk/pgsrc/Help%2FAsciiSVGPlugin
    trunk/pgsrc/Help%2FAtomFeedPlugin
    trunk/pgsrc/Help%2FAuthorHistoryPlugin
    trunk/pgsrc/Help%2FBackLinksPlugin
    trunk/pgsrc/Help%2FCalendarListPlugin
    trunk/pgsrc/Help%2FCreatePagePlugin
    trunk/pgsrc/Help%2FCreateTocPlugin
    trunk/pgsrc/Help%2FDebugBackendInfoPlugin
    trunk/pgsrc/Help%2FDebugRetransformPlugin
    trunk/pgsrc/Help%2FExternalSearchPlugin
    trunk/pgsrc/Help%2FFullTextSearchPlugin
    trunk/pgsrc/Help%2FIncludePagePlugin
    trunk/pgsrc/Help%2FIncludeTreePlugin
    trunk/pgsrc/Help%2FLinkDatabasePlugin
    trunk/pgsrc/Help%2FLinkSearchPlugin
    trunk/pgsrc/Help%2FListSubpagesPlugin
    trunk/pgsrc/Help%2FMostPopularPlugin
    trunk/pgsrc/Help%2FOrphanedPagesPlugin
    trunk/pgsrc/Help%2FRssFeedPlugin
    trunk/pgsrc/Help%2FSearchHighlightPlugin
    trunk/pgsrc/Help%2FVideoPlugin
    trunk/pgsrc/Help%2FWikiAdminSelectPlugin
    trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/Help%2FAddCommentPlugin
===================================================================
--- trunk/pgsrc/Help%2FAddCommentPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FAddCommentPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Fri, 26 Jul 2019 10:46:32 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAddCommentPlugin;
@@ -24,11 +24,11 @@
 ! Default value
 |-
 | **jshide**
-| Boolean if the comments and/or textbox should be initially hidden and on click expanded.
-| 0
+| Boolean. If true, the comments and/or textbox should be initially hidden and on click expanded.
+| false
 |-
 | **order**
-| List comments in chronological (order=normal) or reverse order (order=reverse)
+| List comments in chronological (order=normal) or reverse order (order=reverse).
 | normal
 |-
 | **mode**
@@ -36,8 +36,8 @@
 | add,show
 |-
 | **noheader**
-| Boolean if the “Comments” header should be omitted.
-| 0
+| Boolean. If true, the “Comments” header should be omitted.
+| false
 |-
 | **pagename**
 | Attach to which page?

Modified: trunk/pgsrc/Help%2FAllPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllPagesPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FAllPagesPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAllPagesPlugin;
@@ -32,8 +32,12 @@
 | false
 |-
 | **info**
-|
+| Allows multiple columns: info=mtime,hits,summary,version,author,locked,minor or all
 | none
+|-
+| **userpages**
+| Boolean. If true, display only pages created by users (not the ones created at initialisation of the wiki).
+| false
 |}
 
 == Example ==

Modified: trunk/pgsrc/Help%2FAllUsersPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllUsersPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FAllUsersPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAllUsersPlugin;
@@ -25,11 +25,11 @@
 ! Default value
 |-
 | **noheader**
-| Do not display the header
+| Boolean. If true, do not display the header.
 | false
 |-
 | **include_empty**
-| shows also users which stored their preferences, but never saved their homepage
+| Boolean. If true, shows also users which stored their preferences, but never saved their homepage.
 | true
 |}
 

Modified: trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
===================================================================
--- trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAnalyseAccessLogSqlPlugin;
@@ -37,7 +37,7 @@
 |-
 | **period**
 | Use in combination with the //count// parameter. The type of history period to retrieve from the SQL access log. Blank (the default) for all history, or one of “**weeks**”, “**days**”, “**hours**”, or “**minutes**”.
-|
+| //blank//
 |-
 | **count**
 | Use in combination with the //period// parameter. Must be a number. The number of periods to retrieve from the access log.
@@ -45,7 +45,7 @@
 |-
 | **caption**
 | The value of this parameter is used as the caption for the output. If not set, the caption on the table defaults to the mode.
-|
+| //blank//
 |-
 | **center**
 | If set, the table is centered on the page, otherwise left justified.

Modified: trunk/pgsrc/Help%2FAppendTextPlugin
===================================================================
--- trunk/pgsrc/Help%2FAppendTextPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FAppendTextPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAppendTextPlugin;
@@ -42,7 +42,7 @@
 |
 |-
 | **redirect**
-| Redirect to modified page
+| Boolean. If true, redirect to modified page.
 | false
 |}
 

Modified: trunk/pgsrc/Help%2FAsciiSVGPlugin
===================================================================
--- trunk/pgsrc/Help%2FAsciiSVGPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FAsciiSVGPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAsciiSVGPlugin;
@@ -41,10 +41,10 @@
 | 200
 |-
 | **script**
-|
+| One line script.
 | false
 |-
-| **onmouseover**
+| **onmousemove**
 |
 | false
 |}

Modified: trunk/pgsrc/Help%2FAtomFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FAtomFeedPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FAtomFeedPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAtomFeedPlugin;
@@ -39,7 +39,7 @@
 | 0
 |-
 | **titleonly**
-| If //true//, only displays the title of the entry (boolean)
+| Boolean. If true, only displays the title of the entry.
 | false
 |}
 

Modified: trunk/pgsrc/Help%2FAuthorHistoryPlugin
===================================================================
--- trunk/pgsrc/Help%2FAuthorHistoryPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FAuthorHistoryPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 11 Apr 2019 16:43:21 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAuthorHistoryPlugin;
@@ -27,15 +27,15 @@
 | none
 |-
 | **noheader**
-| Do not display page header
+| Boolean. If true, do not display page header.
 | false
 |-
 | **includeminor**
-| Include minor modifications
+| Boolean. If true, include minor modifications.
 | false
 |-
 | **includedeleted**
-| Include deleted pages
+| Boolean. If true, include deleted pages.
 | false
 |-
 | **author**

Modified: trunk/pgsrc/Help%2FBackLinksPlugin
===================================================================
--- trunk/pgsrc/Help%2FBackLinksPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FBackLinksPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FBackLinksPlugin;
@@ -37,11 +37,11 @@
 | Current page
 |-
 | **include_self**
-| Include yourself in the results.
+| Boolean. If true, include yourself in the results.
 | false
 |-
 | **noheader**
-| Do not display header.
+| Boolean. If true, do not display header.
 | false
 |-
 | **linkmore**

Modified: trunk/pgsrc/Help%2FCalendarListPlugin
===================================================================
--- trunk/pgsrc/Help%2FCalendarListPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FCalendarListPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Sun, 29 Mar 2020 18:53:38 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCalendarListPlugin;
@@ -12,7 +12,6 @@
 Just click any date in the calendar, edit the for that date, then come back to
 this page. The event should be listed below the calendar.
 
-
 == Usage ==
 
 {{{

Modified: trunk/pgsrc/Help%2FCreatePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FCreatePagePlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FCreatePagePlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Mon, 30 Mar 2020 15:49:22 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCreatePagePlugin;
@@ -48,8 +48,8 @@
 |
 |-
 | **overwrite**
-| Boolean, whether to overwrite an existing page.
-|
+| Boolean. If true, overwrite an existing page.
+| false
 |}
 
 == Variable Expansion ==

Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu,  4 Apr 2019 19:24:12 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCreateTocPlugin;
@@ -26,7 +26,7 @@
 ! Default value
 |-
 | **extracollapse**
-| Provide a button to hide/display the Table of Contents
+| Boolean. If true, provide a button to hide/display the Table of Contents.
 | true
 |-
 | **firstlevelstyle**
@@ -42,7 +42,7 @@
 |   
 |-
 | **jshide**
-| Boolean if the Table of Contents should be initially hidden and on click expanded.
+| Boolean. If true, the Table of Contents should be initially hidden and on click expanded.
 | false
 |-
 | **liststyle**
@@ -50,11 +50,11 @@
 | dl
 |-
 | **noheader**
-| Boolean if the Table of Contents header should be omitted.
+| Boolean. If true, the Table of Contents header should be omitted.
 | false
 |-
 | **notoc**
-| Boolean if the Table of Contents should no be displayed (headers are numbered).
+| Boolean. If true, the Table of Contents should no be displayed (headers are numbered).
 | false
 |-
 | **pagename**
@@ -74,11 +74,11 @@
 | 200px
 |-
 | **with_counter**
-| Boolean if hierarchical prefixes should be added.
+| Boolean. If true, hierarchical prefixes should be added.
 | false
 |-
 | **with_toclink**
-| Boolean if headers should link back to the Table of Contents.
+| Boolean. If true, headers should link back to the Table of Contents.
 | false
 |}
 

Modified: trunk/pgsrc/Help%2FDebugBackendInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FDebugBackendInfoPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FDebugBackendInfoPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu,  7 Jan 2021 14:58:16 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FDebugBackendInfoPlugin;
@@ -32,7 +32,7 @@
 | Current pagename
 |-
 | **notallversions**
-| Boolean. If true, only display information for the last version of the page
+| Boolean. If true, only display information for the last version of the page.
 | false
 |}
 

Modified: trunk/pgsrc/Help%2FDebugRetransformPlugin
===================================================================
--- trunk/pgsrc/Help%2FDebugRetransformPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FDebugRetransformPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FDebugRetransformPlugin;
@@ -23,8 +23,8 @@
 ! Default value
 |-
 | **pagename**
-|
-|
+| The page to show markup retransformation from.
+| current pagename
 |}
 
 == Example ==

Modified: trunk/pgsrc/Help%2FExternalSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FExternalSearchPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FExternalSearchPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 24 Dec 2020 18:13:17 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FExternalSearchPlugin;
@@ -41,8 +41,8 @@
 | 30 characters
 |-
 | **debug**
-| Don't really redirect to the external site, just print out the URL that would be redirected to.
-|
+| Boolean. If true, don't really redirect to the external site, just print out the URL that would be redirected to.
+| false
 |}
 
 == Examples ==

Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFullTextSearchPlugin;
@@ -29,11 +29,11 @@
 | //none//
 |-
 | **hilight**
-| Highlight results (boolean)
+| Boolean. If true, highlight results.
 | true
 |-
 | **case_exact**
-| Search with case exact (boolean)
+| Boolean. If true, search with case exact.
 | false
 |-
 | **regex**
@@ -45,7 +45,7 @@
 | ~-hi_content
 |-
 | **noheader**
-| Do not display header (boolean)
+| Boolean. If true, do not display header.
 | false
 |-
 | **exclude**
@@ -53,7 +53,7 @@
 | false
 |-
 | **quiet**
-| Be less verbose (boolean)
+| Boolean. If true, be less verbose.
 | true
 |}
 

Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Mon, 30 Mar 2020 15:49:22 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludePagePlugin;
@@ -32,7 +32,7 @@
 | most recent revision
 |-
 | **quiet**
-| If set, inclusion appears as normal content
+| Boolean. If true, inclusion appears as normal content.
 | false
 |-
 | **bytes**
@@ -56,7 +56,7 @@
 | //None//
 |-
 | **sectionhead**
-| When including a named section show the heading
+| Boolean. If true, when including a named section show the heading
 | false
 |}
 

Modified: trunk/pgsrc/Help%2FIncludeTreePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludeTreePlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FIncludeTreePlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludeTreePlugin;
@@ -43,7 +43,7 @@
 |
 |-
 | **reclimit**
-|
+| Max recursion depth.
 | 2
 |-
 | **info**
@@ -55,11 +55,11 @@
 | back
 |-
 | **firstreversed**
-| If true, get BackLinks for the first page and forward links for the rest.  Only applicable when direction = 'forward'.
+| Boolean. If true, get BackLinks for the first page and forward links for the rest.  Only applicable when direction = 'forward'.
 | false
 |-
 | **excludeunknown**
-| If true (default) then exclude any mentioned pages which don't exist yet.  Only applicable when direction = 'forward'.
+| Boolean. If true, then exclude any mentioned pages which don't exist yet.  Only applicable when direction = 'forward'.
 | true
 |-
 | **dtree**
@@ -67,7 +67,6 @@
 | true
 |}
 
-
 == Example ==
 
 {{{

Modified: trunk/pgsrc/Help%2FLinkDatabasePlugin
===================================================================
--- trunk/pgsrc/Help%2FLinkDatabasePlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FLinkDatabasePlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FLinkDatabasePlugin;
@@ -33,7 +33,7 @@
 | false
 |-
 | **include_empty**
-|
+| Boolean. If true, pages that are referenced but not yet created are included in the list.
 | false
 |-
 | **exclude_from**

Modified: trunk/pgsrc/Help%2FLinkSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FLinkSearchPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FLinkSearchPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FLinkSearchPlugin
@@ -45,7 +45,7 @@
 | auto
 |-
 | **noform**
-| don't show form with results.
+| Boolean. If true, don't show form with results.
 | false
 |-
 | **noheader**

Modified: trunk/pgsrc/Help%2FListSubpagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FListSubpagesPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FListSubpagesPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FListSubpagesPlugin;
@@ -34,7 +34,7 @@
 | none
 |-
 | **noheader**
-| Do not display header
+| Boolean. If true, do not display header.
 | false
 |-
 | **info**

Modified: trunk/pgsrc/Help%2FMostPopularPlugin
===================================================================
--- trunk/pgsrc/Help%2FMostPopularPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FMostPopularPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FMostPopularPlugin;
@@ -33,7 +33,7 @@
 | ~-hits
 |-
 | **noheader**
-| Do not display header
+| Boolean. If true, do not display header.
 | false
 |-
 | **info**

Modified: trunk/pgsrc/Help%2FOrphanedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FOrphanedPagesPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FOrphanedPagesPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FOrphanedPagesPlugin;
@@ -26,7 +26,7 @@
 | false
 |-
 | **include_empty**
-|
+| Boolean. If true, pages that are referenced but not yet created are included in the list.
 | false
 |-
 | **exclude**

Modified: trunk/pgsrc/Help%2FRssFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FRssFeedPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FRssFeedPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Fri,  5 Apr 2019 10:48:21 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRssFeedPlugin;
@@ -39,7 +39,7 @@
 | 0
 |-
 | **titleonly**
-| If //true//, do not display item body (boolean)
+| Boolean. If true, do not display item body.
 | false
 |}
 

Modified: trunk/pgsrc/Help%2FSearchHighlightPlugin
===================================================================
--- trunk/pgsrc/Help%2FSearchHighlightPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FSearchHighlightPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSearchHighlightPlugin;
@@ -26,11 +26,11 @@
 | //none//
 |-
 | **case_exact**
-| boolean
+| Boolean
 | false
 |-
 | **regex**
-| boolean
+| Boolean
 | false
 |}
 

Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FVideoPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Mon, 28 Dec 2020 19:46:14 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FVideoPlugin;
@@ -41,7 +41,7 @@
 | 320
 |-
 | **autoplay**
-| Auto play the video when page is displayed (boolean).
+| Boolean. If true, auto play the video when page is displayed.
 | false
 |}
 

Modified: trunk/pgsrc/Help%2FWikiAdminSelectPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSelectPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FWikiAdminSelectPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminSelectPlugin;
@@ -24,11 +24,11 @@
 ! Default value
 |-
 | **noheader**
-| Boolean header should be omitted.
+| Boolean. If true, header should be omitted.
 | false
 |-
 | **include_empty**
-| Boolean
+| Boolean. If true, pages that are referenced but not yet created are included in the list.
 | false
 |-
 | **info**

Modified: trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminSetExternalPlugin;
@@ -22,8 +22,8 @@
 ! Default value
 |-
 | **external**
-| Boolean
-| 1
+| Boolean. If true, set the page to external.
+| true
 |-
 | **s**
 | Pages to select

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-02-04 18:00:47 UTC (rev 10243)
+++ trunk/pgsrc/ReleaseNotes	2021-02-20 11:10:02 UTC (rev 10244)
@@ -1,4 +1,4 @@
-Date: Sat,  9 Jan 2021 13:05:46 +0000
+Date: Sat, 20 Feb 2021 11:52:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,7 +8,7 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
-== 1.6.0 2021-01-XX Marc-Etienne Vargenau ==
+== 1.6.0 2021-02-XX Marc-Etienne Vargenau ==
 
 Major release:
 * PHP 7 compatible (works from PHP 5.3.3 to PHP 7)
@@ -40,6 +40,7 @@
 * Valid HTML5 and CSS3 logos (in debug mode)
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php)
+* Remove USE_SAFE_DBSESSION (always true)
 * PDO patch by Sébastien Le Callonnec
 * Updated pgsrc pages in all languages
 * Adding SPDX-License-Identifier in PHP source files

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10243] trunk/lib

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

Revision: 10243
          http://sourceforge.net/p/phpwiki/code/10243
Author:   vargenau
Date:     2021-02-04 18:00:47 +0000 (Thu, 04 Feb 2021)
Log Message:
-----------
Remove useless DEBUG

Modified Paths:
--------------
    trunk/lib/PageList.php
    trunk/lib/TextSearchQuery.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiTheme.php

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2021-01-16 19:56:38 UTC (rev 10242)
+++ trunk/lib/PageList.php	2021-02-04 18:00:47 UTC (rev 10243)
@@ -1086,23 +1086,13 @@
         if ($action == 'get') {
             return $order . $column;
         } elseif ($action == 'flip_order') {
-            if (0 and DEBUG)
-                trigger_error("flip $order $column " . $this->id, E_USER_NOTICE);
             return ($order == '+' ? '-' : '+') . $column;
         } elseif ($action == 'init') { // only allowed from PageList::PageList
-            if (0 and DEBUG) {
-                if ($this->sortby($column, 'clicked')) {
-                    trigger_error("clicked $order $column $this->id", E_USER_NOTICE);
-                }
-            }
             $this->_sortby[$column] = $order; // forces show icon
             return $order . $column;
         } elseif ($action == 'check') { // show icon?
             //if specified via arg or if clicked
             $show = (!empty($this->_sortby[$column]) or $this->sortby($column, 'clicked'));
-            if (0 and $show and DEBUG) {
-                trigger_error("show $order $column " . $this->id, E_USER_NOTICE);
-            }
             return $show;
         } elseif ($action == 'clicked') { // flip sort order?
             global $request;

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2021-01-16 19:56:38 UTC (rev 10242)
+++ trunk/lib/TextSearchQuery.php	2021-02-04 18:00:47 UTC (rev 10243)
@@ -573,11 +573,6 @@
             return false;
         $search = $this->workquery;
         $result = false;
-        //if (DEBUG & _DEBUG_VERBOSE)
-        //    trigger_error("\$result = (boolean)($search);", E_USER_NOTICE);
-        // We might have a numerical problem:
-        // php-4.2.2 eval'ed as module: "9.636e+08 > 1000" false;
-        // php-5.1.2 cgi true, 4.2.2 cgi true
         eval("\$result = (boolean)($search);");
         if ($result and is_array($p)) {
             return $this->bound();

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-01-16 19:56:38 UTC (rev 10242)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-02-04 18:00:47 UTC (rev 10243)
@@ -484,7 +484,6 @@
 
     /*
      * Update link table.
-     * on DEBUG: delete old, deleted links from page
      */
     function set_links($pagename, $links)
     {
@@ -519,7 +518,6 @@
                 $linkid = $this->_get_pageid($linkto, true);
                 if (!$linkid) {
                     echo("No link for $linkto on page $pagename");
-                    //printSimpleTrace(debug_backtrace());
                     trigger_error("No link for $linkto on page $pagename");
                 }
                 assert($linkid);

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2021-01-16 19:56:38 UTC (rev 10242)
+++ trunk/lib/WikiTheme.php	2021-02-04 18:00:47 UTC (rev 10243)
@@ -296,8 +296,6 @@
             $path = $parent->_findFile($file, 1);
             if ($path) {
                 return $path;
-            } elseif (0 and DEBUG & (_DEBUG_VERBOSE + _DEBUG_REMOTE)) {
-                trigger_error("$parent->_theme/$file: not found", E_USER_NOTICE);
             }
         }
         if (isset($this->_default_theme)) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10242] trunk/lib/main.php

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

Revision: 10242
          http://sourceforge.net/p/phpwiki/code/10242
Author:   vargenau
Date:     2021-01-16 19:56:38 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
Fix error on logout

Modified Paths:
--------------
    trunk/lib/main.php

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-01-16 19:24:53 UTC (rev 10241)
+++ trunk/lib/main.php	2021-01-16 19:56:38 UTC (rev 10242)
@@ -463,8 +463,10 @@
         }
         $this->_user->_group = $this->getGroup();
         $this->setSessionVar('wiki_user', $user);
-        $this->_prefs->set('userid',
-            $isSignedIn ? $user->getId() : '');
+        if ($isSignedIn) {
+            $this->_prefs->set('userid', $user->getId());
+        }
+
         $this->initializeTheme($isSignedIn ? 'login' : 'logout');
         define('MAIN_setUser', true);
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10241] trunk/lib/DbSession/ADODB.php

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

Revision: 10241
          http://sourceforge.net/p/phpwiki/code/10241
Author:   vargenau
Date:     2021-01-16 19:24:53 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
No &

Modified Paths:
--------------
    trunk/lib/DbSession/ADODB.php

Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2021-01-16 19:24:03 UTC (rev 10240)
+++ trunk/lib/DbSession/ADODB.php	2021-01-16 19:24:53 UTC (rev 10241)
@@ -53,7 +53,7 @@
         $dbh = &$this->_dbh;
         if (!$dbh or !is_resource($dbh->_connectionID)) {
             if (!$parsed) $parsed = parseDSN($request->_dbi->getParam('dsn'));
-            $this->_dbh =& ADONewConnection($parsed['phptype']); // Probably only MySql works just now
+            $this->_dbh = ADONewConnection($parsed['phptype']); // Probably only MySql works just now
             $this->_dbh->Connect($parsed['hostspec'], $parsed['username'],
                 $parsed['password'], $parsed['database']);
             $dbh = &$this->_dbh;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10240] trunk/lib/DbSession/dba.php

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

Revision: 10240
          http://sourceforge.net/p/phpwiki/code/10240
Author:   vargenau
Date:     2021-01-16 19:24:03 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
Same name as parent

Modified Paths:
--------------
    trunk/lib/DbSession/dba.php

Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php	2021-01-16 19:23:05 UTC (rev 10239)
+++ trunk/lib/DbSession/dba.php	2021-01-16 19:24:03 UTC (rev 10240)
@@ -49,9 +49,9 @@
             array(&$this, 'gc'));
     }
 
-    function quote($str)
+    function quote($string)
     {
-        return $str;
+        return $string;
     }
 
     function query($sql)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10239] trunk/lib/DbSession.php

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

Revision: 10239
          http://sourceforge.net/p/phpwiki/code/10239
Author:   vargenau
Date:     2021-01-16 19:23:05 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
Fix __construct prototype

Modified Paths:
--------------
    trunk/lib/DbSession.php

Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php	2021-01-16 17:56:34 UTC (rev 10238)
+++ trunk/lib/DbSession.php	2021-01-16 19:23:05 UTC (rev 10239)
@@ -38,14 +38,12 @@
 {
     /**
      * @param mixed $dbh
-     * DB handle, or WikiDB object (from which the DB handle will
-     * be extracted.
+     * DB handle, or WikiDB object (from which the DB handle will be extracted.
      *
      * @param string $table
-     * @return bool|DbSession
      * Name of SQL table containing session data.
      */
-    function __construct(&$dbh, $table = 'session')
+    function __construct($dbh, $table = 'session')
     {
         // Check for existing DbSession handler
         $db_type = $dbh->getParam('dbtype');

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

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

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

Revision: 10238
          http://sourceforge.net/p/phpwiki/code/10238
Author:   vargenau
Date:     2021-01-16 17:56:34 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
Remove USE_SAFE_DBSESSION

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/doc/INSTALL.mssqlnative
    trunk/lib/DbSession/ADODB.php
    trunk/lib/DbSession/PDO.php
    trunk/lib/DbSession/SQL.php
    trunk/lib/DbSession.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/config/config-default.ini	2021-01-16 17:56:34 UTC (rev 10238)
@@ -17,7 +17,6 @@
 ENABLE_SPAMBLOCKLIST = false
 GOOGLE_LINKS_NOFOLLOW = true
 NUM_SPAM_LINKS = 20
-USE_SAFE_DBSESSION = false
 ENABLE_DISCUSSION_LINK = false
 ENABLE_CAPTCHA = false
 ENABLE_MAILNOTIFY = true

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/config/config-dist.ini	2021-01-16 17:56:34 UTC (rev 10238)
@@ -138,12 +138,6 @@
 ; Captcha will use a random word, otherwise a dictionary word.
 ;USE_CAPTCHA_RANDOM_WORD = false
 
-; USE_SAFE_DBSESSION should be enabled, if you encounter session problems, with
-; duplicate INSERT sess_id warnings at the bottom of the page. Reason is a
-; unreliable affected_rows implementation() in the sql backend.
-; Default is Disabled, using the fastest DbSession UPDATE method.
-;USE_SAFE_DBSESSION = false
-
 ; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but
 ; Blog/day/time only. Convenience for a single-user blog theme.
 ;BLOG_DEFAULT_EMPTY_PREFIX = true

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/configurator.php	2021-01-16 17:56:34 UTC (rev 10238)
@@ -465,9 +465,6 @@
 $properties["USE_CAPTCHA_RANDOM_WORD"] =
     new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD');
 
-$properties["USE_SAFE_DBSESSION"] =
-    new boolean_define_commented_optional('USE_SAFE_DBSESSION');
-
 $properties["BLOG_DEFAULT_EMPTY_PREFIX"] =
     new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX');
 

Modified: trunk/doc/INSTALL.mssqlnative
===================================================================
--- trunk/doc/INSTALL.mssqlnative	2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/doc/INSTALL.mssqlnative	2021-01-16 17:56:34 UTC (rev 10238)
@@ -43,7 +43,6 @@
 	  have to edit schemas/sqlsrv-initialize.sql before you perform step
       three (above). You might also edit schemas/sqlsrv-destroy.sql at the
 	  same time, so you don't forget.
-   d) USE_SAFE_DBSESSION should be set to 'true'
 	
    Note: DATABASE_DIRECTORY and DATABASE_DBA_HANDLER are ignored for mssql.
 

Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/lib/DbSession/ADODB.php	2021-01-16 17:56:34 UTC (rev 10238)
@@ -172,26 +172,10 @@
             $sess_data = base64_encode($sess_data);
         $qdata = $dbh->qstr($sess_data);
 
-        /* AffectedRows with sessions seems to be instable on certain platforms.
-         * Enable the safe and slow USE_SAFE_DBSESSION then.
-         */
-        if (USE_SAFE_DBSESSION) {
-            $dbh->Execute("DELETE FROM $table"
-                . " WHERE sess_id=$qid");
-            $rs = $dbh->Execute("INSERT INTO $table"
+        $dbh->execute("DELETE FROM $table WHERE sess_id=$qid");
+        $rs = $dbh->execute("INSERT INTO $table"
                 . " (sess_id, sess_data, sess_date, sess_ip)"
                 . " VALUES ($qid, $qdata, $time, $qip)");
-        } else {
-            $rs = $dbh->Execute("UPDATE $table"
-                . " SET sess_data=$qdata, sess_date=$time, sess_ip=$qip"
-                . " WHERE sess_id=$qid");
-            $result = $dbh->Affected_Rows();
-            if ($result === false or $result < 1) { // false or int > 0
-                $rs = $dbh->Execute("INSERT INTO $table"
-                    . " (sess_id, sess_data, sess_date, sess_ip)"
-                    . " VALUES ($qid, $qdata, $time, $qip)");
-            }
-        }
         $result = !$rs->EOF;
         if ($result) $rs->free();
         $this->_disconnect();

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/lib/DbSession/PDO.php	2021-01-16 17:56:34 UTC (rev 10238)
@@ -168,46 +168,21 @@
         if (is_a($dbh, 'ADODB_postgres64'))
             $sess_data = base64_encode($sess_data);
 
-        /* AffectedRows with sessions seems to be unstable on certain platforms.
-         * Enable the safe and slow USE_SAFE_DBSESSION then.
-         */
-        if (USE_SAFE_DBSESSION) {
-            $this->_backend->beginTransaction();
-            $delete = $this->prepare("DELETE FROM $table"
-                . " WHERE sess_id=?");
-            $delete->bindParam(1, $id, PDO::PARAM_STR, 32);
-            $delete->execute();
-            $sth = $dbh->prepare("INSERT INTO $table"
-                . " (sess_id, sess_data, sess_date, sess_ip)"
-                . " VALUES (?, ?, ?, ?)");
-            $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
-            $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
-            $sth->bindParam(3, $time, PDO::PARAM_INT);
-            $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
-            if ($result = $sth->execute()) {
-                $this->_backend->commit();
-            } else {
-                $this->_backend->rollBack();
-            }
+        $this->_backend->beginTransaction();
+        $delete = $this->prepare("DELETE FROM $table WHERE sess_id=?");
+        $delete->bindParam(1, $id, PDO::PARAM_STR, 32);
+        $delete->execute();
+        $sth = $dbh->prepare("INSERT INTO $table"
+            . " (sess_id, sess_data, sess_date, sess_ip)"
+            . " VALUES (?, ?, ?, ?)");
+        $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
+        $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
+        $sth->bindParam(3, $time, PDO::PARAM_INT);
+        $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
+        if ($result = $sth->execute()) {
+            $this->_backend->commit();
         } else {
-            $sth = $dbh->prepare("UPDATE $table"
-                . " SET sess_data=?, sess_date=?, sess_ip=?"
-                . " WHERE sess_id=?");
-            $sth->bindParam(1, $sess_data, PDO::PARAM_LOB);
-            $sth->bindParam(2, $time, PDO::PARAM_INT);
-            $sth->bindParam(3, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
-            $sth->bindParam(4, $id, PDO::PARAM_STR, 32);
-            $result = $sth->execute(); // implicit affected rows
-            if ($result === false or $result < 1) { // false or int > 0
-                $sth = $dbh->prepare("INSERT INTO $table"
-                    . " (sess_id, sess_data, sess_date, sess_ip)"
-                    . " VALUES (?, ?, ?, ?)");
-                $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
-                $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
-                $sth->bindParam(3, $time, PDO::PARAM_INT);
-                $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
-                $result = $sth->execute();
-            }
+            $this->_backend->rollBack();
         }
         $this->_disconnect();
         return $result;

Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php	2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/lib/DbSession/SQL.php	2021-01-16 17:56:34 UTC (rev 10238)
@@ -178,26 +178,10 @@
             $sess_data = base64_encode($sess_data);
         $qdata = $dbh->quote($sess_data);
 
-        /* AffectedRows with sessions seems to be unstable on certain platforms.
-         * Enable the safe and slow USE_SAFE_DBSESSION then.
-         */
-        if (USE_SAFE_DBSESSION) {
-            $dbh->query("DELETE FROM $table"
-                . " WHERE sess_id=$qid");
-            $res = $dbh->query("INSERT INTO $table"
-                . " (sess_id, sess_data, sess_date, sess_ip)"
-                . " VALUES ($qid, $qdata, $time, $qip)");
-        } else {
-            $res = $dbh->query("UPDATE $table"
-                . " SET sess_data=$qdata, sess_date=$time, sess_ip=$qip"
-                . " WHERE sess_id=$qid");
-            $result = $dbh->AffectedRows();
-            if ($result === false or $result < 1) { // 0 cannot happen: time, -1 (failure) on mysql
-                $res = $dbh->query("INSERT INTO $table"
-                    . " (sess_id, sess_data, sess_date, sess_ip)"
-                    . " VALUES ($qid, $qdata, $time, $qip)");
-            }
-        }
+        $dbh->query("DELETE FROM $table WHERE sess_id=$qid");
+        $res = $dbh->query("INSERT INTO $table"
+            . " (sess_id, sess_data, sess_date, sess_ip)"
+            . " VALUES ($qid, $qdata, $time, $qip)");
         $this->_disconnect();
         return !DB::isError($res);
     }

Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php	2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/lib/DbSession.php	2021-01-16 17:56:34 UTC (rev 10238)
@@ -33,7 +33,6 @@
  * Quasi-major rewrite/decruft/fix by Jeff Dairiki <da...@da...>.
  * ADODB, dba and PDO classes by Reini Urban.
  *
- * Warning: Enable USE_SAFE_DBSESSION if you get INSERT duplicate id warnings.
  */
 class DbSession
 {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10237] trunk/lib/WikiUser.php

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

Revision: 10237
          http://sourceforge.net/p/phpwiki/code/10237
Author:   vargenau
Date:     2021-01-16 17:44:56 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
Add default value for id_only in function setPreferences

Modified Paths:
--------------
    trunk/lib/WikiUser.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2021-01-09 12:07:29 UTC (rev 10236)
+++ trunk/lib/WikiUser.php	2021-01-16 17:44:56 UTC (rev 10237)
@@ -381,7 +381,7 @@
 
     abstract function getPreferences();
 
-    abstract function setPreferences($prefs, $id_only);
+    abstract function setPreferences($prefs, $id_only = false);
 
     function userExists()
     {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10236] trunk/pgsrc/ReleaseNotes

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

Revision: 10236
          http://sourceforge.net/p/phpwiki/code/10236
Author:   vargenau
Date:     2021-01-09 12:07:29 +0000 (Sat, 09 Jan 2021)
Log Message:
-----------
pgsrc/ReleaseNotes: Bugs --> Fixes; update

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-01-09 11:31:22 UTC (rev 10235)
+++ trunk/pgsrc/ReleaseNotes	2021-01-09 12:07:29 UTC (rev 10236)
@@ -1,4 +1,4 @@
-Date: Sat,  2 Jan 2021 19:46:14 +0000
+Date: Sat,  9 Jan 2021 13:05:46 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,14 +8,23 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
-== 1.6.0 2020-12-XX Marc-Etienne Vargenau ==
+== 1.6.0 2021-01-XX Marc-Etienne Vargenau ==
 
 Major release:
-* PHP 7 compatible
+* PHP 7 compatible (works from PHP 5.3.3 to PHP 7)
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
 * Flash is dead
 * Internet Explorer is dead
 
+=== Fixes ===
+* Make function IsSafeURL more strict
+* Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3)
+* It was possible to rename a page to a name with illegal characters, like ~[~]
+* Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
+* Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
+* Better check arguments for ~GoogleMaps plugin
+* Security fixes
+
 === Changes ===
 * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
 * Update jQuery to 2.2.4
@@ -33,17 +42,8 @@
 * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php)
 * PDO patch by Sébastien Le Callonnec
 * Updated pgsrc pages in all languages
-* Security fixes
 * Adding SPDX-License-Identifier in PHP source files
 
-===  Bugs ===
-* Make function IsSafeURL more strict
-* Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3)
-* It was possible to rename a page to a name with illegal characters, like ~[~]
-* Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
-* Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
-* Better check arguments for ~GoogleMaps plugin
-
 ===  Plugins ===
 * ~UpLoad plugin: put date and author in history
 * ~UpLoad plugin: don't inline images
@@ -52,6 +52,7 @@
 * Use jquery.autoheight.js plugin for Transclude plugin
 * Repair [[Help:PhotoAlbumPlugin|PhotoAlbumPlugin]]
 * Rename action page ~DebugInfo as ~DebugBackendInfo (to be consistent with plugin name)
+* Better check boolean arguments in plugins
 
 == 1.5.5 2015-12-11 Marc-Etienne Vargenau ==
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10235] trunk/lib/plugin/CreateToc.php

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

Revision: 10235
          http://sourceforge.net/p/phpwiki/code/10235
Author:   vargenau
Date:     2021-01-09 11:31:22 +0000 (Sat, 09 Jan 2021)
Log Message:
-----------
lib/plugin/CreateToc.php: check all boolean arguments

Modified Paths:
--------------
    trunk/lib/plugin/CreateToc.php

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2021-01-08 17:26:59 UTC (rev 10234)
+++ trunk/lib/plugin/CreateToc.php	2021-01-09 11:31:22 UTC (rev 10235)
@@ -51,21 +51,22 @@
 
     function getDefaultArguments()
     {
-        return array('extracollapse' => 1, // provide an entry +/- link to collapse
+        return array(
+            'extracollapse' => true, // provide an entry +/- link to collapse
             'firstlevelstyle' => 'number', // 'number', 'letter' or 'roman'
             'headers' => "1,2,3,4,5", // "!!!"=>h2, "!!"=>h3, "!"=>h4
-            // "1"=>h2, "2"=>h3, "3"=>h4, "4"=>h5, "5"=>h6
+                                      // "1"=>h2, "2"=>h3, "3"=>h4, "4"=>h5, "5"=>h6
             'indentstr' => '  ',
-            'jshide' => 0, // collapsed TOC as DHTML button
+            'jshide' => false, // collapsed TOC as DHTML button
             'liststyle' => 'dl', // 'dl' or 'ul' or 'ol'
-            'noheader' => 0, // omit "Table of Contents" header
-            'notoc' => 0, // do not display TOC, only number headers
+            'noheader' => false, // omit "Table of Contents" header
+            'notoc' => false, // do not display TOC, only number headers
             'pagename' => '[pagename]', // TOC of another page here?
             'position' => 'full', // full, right or left
+            'version' => false, // Most recent version
             'width' => '200px',
-            'with_counter' => 0,
-            'with_toclink' => 0, // link back to TOC
-            'version' => false,
+            'with_counter' => false,
+            'with_toclink' => false, // link back to TOC
         );
     }
 
@@ -398,6 +399,7 @@
     {
         global $WikiTheme;
         extract($this->getArgs($argstr, $request));
+
         if ($pagename) {
             // Expand relative page names.
             $page = new WikiPageName($pagename, $basepage);
@@ -406,6 +408,55 @@
         if (!$pagename) {
             return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
         }
+
+        if (($extracollapse == '0') || ($extracollapse == 'false')) {
+            $extracollapse = false;
+        } elseif (($extracollapse == '1') || ($extracollapse == 'true')) {
+            $extracollapse = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "extracollapse"));
+        }
+
+        if (($jshide == '0') || ($jshide == 'false')) {
+            $jshide = false;
+        } elseif (($jshide == '1') || ($jshide == 'true')) {
+            $jshide = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "jshide"));
+        }
+
+        if (($noheader == '0') || ($noheader == 'false')) {
+            $noheader = false;
+        } elseif (($noheader == '1') || ($noheader == 'true')) {
+            $noheader = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader"));
+        }
+
+        if (($notoc == '0') || ($notoc == 'false')) {
+            $notoc = false;
+        } elseif (($notoc == '1') || ($notoc == 'true')) {
+            $notoc = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "notoc"));
+        }
+
+        if (($with_counter == '0') || ($with_counter == 'false')) {
+            $with_counter = false;
+        } elseif (($with_counter == '1') || ($with_counter == 'true')) {
+            $with_counter = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "with_counter"));
+        }
+
+        if (($with_toclink == '0') || ($with_toclink == 'false')) {
+            $with_toclink = false;
+        } elseif (($with_toclink == '1') || ($with_toclink == 'true')) {
+            $with_toclink = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "with_toclink"));
+        }
+
         if (($notoc) or ($liststyle == 'ol')) {
             $with_counter = 1;
         }
@@ -415,9 +466,6 @@
         ) {
             return $this->error(_("Error: firstlevelstyle must be 'number', 'letter' or 'roman'"));
         }
-        if ($extracollapse == 'false') {
-            $extracollapse = false;
-        }
 
         // Check if page exists.
         if (!($dbi->isWikiPage($pagename))) {

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

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

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

Revision: 10234
          http://sourceforge.net/p/phpwiki/code/10234
Author:   vargenau
Date:     2021-01-08 17:26:59 +0000 (Fri, 08 Jan 2021)
Log Message:
-----------
Make error message generic

Modified Paths:
--------------
    trunk/lib/plugin/DebugBackendInfo.php
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/lib/plugin/DebugBackendInfo.php	2021-01-08 17:26:59 UTC (rev 10234)
@@ -70,7 +70,7 @@
         } elseif (($notallversions == '1') || ($notallversions == 'true')) {
             $notallversions = true;
         } else {
-            return $this->error(_("Argument 'notallversions' must be a boolean"));
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "notallversions"));
         }
 
         $backend = &$dbi->_backend;

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/de.po	2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1568,7 +1568,8 @@
 msgid "Get debugging information for %s."
 msgstr "Debug-Informationen von %s."
 
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/es.po	2021-01-08 17:26:59 UTC (rev 10234)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1539,7 +1539,8 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/fr.po	2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1561,8 +1561,9 @@
 msgid "Get debugging information for %s."
 msgstr "Obtenir des informations de débogage pour %s."
 
-msgid "Argument 'notallversions' must be a boolean"
-msgstr "L'argument 'notallversions' doit être un booléen"
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr "L'argument '%s' doit être un booléen"
 
 #, php-format
 msgid "Querying backend directly for “%s”"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/it.po	2021-01-08 17:26:59 UTC (rev 10234)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1522,7 +1522,8 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/ja.po	2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1508,7 +1508,8 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/nl.po	2021-01-08 17:26:59 UTC (rev 10234)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1514,7 +1514,8 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/phpwiki.pot	2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1508,7 +1508,8 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/sv.po	2021-01-08 17:26:59 UTC (rev 10234)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1509,7 +1509,8 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/zh.po	2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1513,7 +1513,8 @@
 msgid "Get debugging information for %s."
 msgstr "為 %s 取得除錯資訊."
 
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
 msgstr ""
 
 #, php-format

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10233] trunk/locale

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

Revision: 10233
          http://sourceforge.net/p/phpwiki/code/10233
Author:   vargenau
Date:     2021-01-07 17:26:41 +0000 (Thu, 07 Jan 2021)
Log Message:
-----------
Update locale

Modified Paths:
--------------
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/de.po	2021-01-07 17:26:41 UTC (rev 10233)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1568,6 +1568,9 @@
 msgid "Get debugging information for %s."
 msgstr "Debug-Informationen von %s."
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr ""
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr "DB Debug Informationen von der Seite »%s«"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/es.po	2021-01-07 17:26:41 UTC (rev 10233)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1539,6 +1539,9 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr ""
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/fr.po	2021-01-07 17:26:41 UTC (rev 10233)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1561,6 +1561,9 @@
 msgid "Get debugging information for %s."
 msgstr "Obtenir des informations de débogage pour %s."
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr "L'argument 'notallversions' doit être un booléen"
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr "Requête directe au backend pour « %s »"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/it.po	2021-01-07 17:26:41 UTC (rev 10233)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1522,6 +1522,9 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr ""
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/ja.po	2021-01-07 17:26:41 UTC (rev 10233)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1508,6 +1508,9 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr ""
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/nl.po	2021-01-07 17:26:41 UTC (rev 10233)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1514,6 +1514,9 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr ""
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/phpwiki.pot	2021-01-07 17:26:41 UTC (rev 10233)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1508,6 +1508,9 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr ""
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/sv.po	2021-01-07 17:26:41 UTC (rev 10233)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1509,6 +1509,9 @@
 msgid "Get debugging information for %s."
 msgstr ""
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr ""
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-01-07 17:19:50 UTC (rev 10232)
+++ trunk/locale/po/zh.po	2021-01-07 17:26:41 UTC (rev 10233)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 11:35+0100\n"
+"POT-Creation-Date: 2021-01-07 18:25+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1513,6 +1513,9 @@
 msgid "Get debugging information for %s."
 msgstr "為 %s 取得除錯資訊."
 
+msgid "Argument 'notallversions' must be a boolean"
+msgstr ""
+
 #, php-format
 msgid "Querying backend directly for “%s”"
 msgstr "為 “%s” 直接查詢後台"

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

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

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

Revision: 10232
          http://sourceforge.net/p/phpwiki/code/10232
Author:   vargenau
Date:     2021-01-07 17:19:50 +0000 (Thu, 07 Jan 2021)
Log Message:
-----------
lib/plugin/DebugBackendInfo.php: check "notallversions" is a boolean; update help page

Modified Paths:
--------------
    trunk/lib/plugin/DebugBackendInfo.php
    trunk/pgsrc/Help%2FDebugBackendInfoPlugin

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2021-01-07 15:45:54 UTC (rev 10231)
+++ trunk/lib/plugin/DebugBackendInfo.php	2021-01-07 17:19:50 UTC (rev 10232)
@@ -39,7 +39,7 @@
     function getDefaultArguments()
     {
         return array('page' => '[pagename]',
-            'notallversions' => 0);
+                     'notallversions' => false);
     }
 
     /**
@@ -62,8 +62,16 @@
             $request->_notAuthorized(WIKIAUTH_ADMIN);
             $this->disabled("! user->isAdmin");
         }
-        if (empty($page))
+        if (empty($page)) {
             return $this->error("page missing");
+        }
+        if (($notallversions == '0') || ($notallversions == 'false')) {
+            $notallversions = false;
+        } elseif (($notallversions == '1') || ($notallversions == 'true')) {
+            $notallversions = true;
+        } else {
+            return $this->error(_("Argument 'notallversions' must be a boolean"));
+        }
 
         $backend = &$dbi->_backend;
         $this->chunk_split = true;
@@ -81,7 +89,7 @@
             $this->_fixupData($pagedata);
             $table->pushContent($this->_showhash("get_pagedata('$page')", $pagedata));
         }
-        if (!$notallversions) {
+        if ($notallversions) {
             $version = $backend->get_latest_version($page);
             $vdata = $backend->get_versiondata($page, $version, true);
             $this->_fixupData($vdata);

Modified: trunk/pgsrc/Help%2FDebugBackendInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FDebugBackendInfoPlugin	2021-01-07 15:45:54 UTC (rev 10231)
+++ trunk/pgsrc/Help%2FDebugBackendInfoPlugin	2021-01-07 17:19:50 UTC (rev 10232)
@@ -1,4 +1,4 @@
-Date: Fri, 26 Apr 2019 14:58:16 +0000
+Date: Thu,  7 Jan 2021 14:58:16 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FDebugBackendInfoPlugin;
@@ -32,8 +32,8 @@
 | Current pagename
 |-
 | **notallversions**
-|
-| 0
+| Boolean. If true, only display information for the last version of the page
+| false
 |}
 
 == Example ==

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10231] trunk/lib/plugin/DebugBackendInfo.php

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

Revision: 10231
          http://sourceforge.net/p/phpwiki/code/10231
Author:   vargenau
Date:     2021-01-07 15:45:54 +0000 (Thu, 07 Jan 2021)
Log Message:
-----------
lib/plugin/DebugBackendInfo.php: no need for a table if no pagedata

Modified Paths:
--------------
    trunk/lib/plugin/DebugBackendInfo.php

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2021-01-07 11:13:17 UTC (rev 10230)
+++ trunk/lib/plugin/DebugBackendInfo.php	2021-01-07 15:45:54 UTC (rev 10231)
@@ -70,14 +70,13 @@
         $this->readonly_pagemeta = array();
         $this->hidden_pagemeta = array('_cached_html');
 
-        $html = HTML(HTML::h2(fmt("Querying backend directly for “%s”",
-            $page)));
+        $html = HTML(HTML::h2(fmt("Querying backend directly for “%s”", $page)));
 
         $table = HTML::table(array('class' => 'bordered'));
         $pagedata = $backend->get_pagedata($page);
         if (!$pagedata) {
-            // FIXME: invalid HTML
             $html->pushContent(HTML::p(fmt("No pagedata for %s", $page)));
+            return $html;
         } else {
             $this->_fixupData($pagedata);
             $table->pushContent($this->_showhash("get_pagedata('$page')", $pagedata));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10230] trunk/themes

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

Revision: 10230
          http://sourceforge.net/p/phpwiki/code/10230
Author:   vargenau
Date:     2021-01-07 11:13:17 +0000 (Thu, 07 Jan 2021)
Log Message:
-----------
Remove "float: right" so that "position=full" works in CreateToc plugin

Modified Paths:
--------------
    trunk/themes/MonoBook/monobook.css
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2021-01-06 18:34:30 UTC (rev 10229)
+++ trunk/themes/MonoBook/monobook.css	2021-01-07 11:13:17 UTC (rev 10230)
@@ -389,8 +389,6 @@
     background-color: #f9f9f9;
     padding: 5px;
     font-size: 95%;
-    float: right;
-    clear: right;
 }
 
 #toc #toctitle,

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2021-01-06 18:34:30 UTC (rev 10229)
+++ trunk/themes/Sidebar/sidebar.css	2021-01-07 11:13:17 UTC (rev 10230)
@@ -431,8 +431,6 @@
     background-color: #f9f9f9;
     padding: 5px;
     font-size: 95%;
-    float: right;
-    clear: right;
 }
 
 #toc h2,

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10229] trunk/lib/plugin/DebugGroupInfo.php

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

Revision: 10229
          http://sourceforge.net/p/phpwiki/code/10229
Author:   vargenau
Date:     2021-01-06 18:34:30 +0000 (Wed, 06 Jan 2021)
Log Message:
-----------
lib/plugin/DebugGroupInfo.php: no <h1> needed; use list

Modified Paths:
--------------
    trunk/lib/plugin/DebugGroupInfo.php

Modified: trunk/lib/plugin/DebugGroupInfo.php
===================================================================
--- trunk/lib/plugin/DebugGroupInfo.php	2021-01-05 18:39:04 UTC (rev 10228)
+++ trunk/lib/plugin/DebugGroupInfo.php	2021-01-06 18:34:30 UTC (rev 10229)
@@ -51,7 +51,7 @@
         $args = $this->getArgs($argstr, $request);
         extract($args);
 
-        $output = HTML(HTML::h1("Group Info"));
+        $output = HTML();
 
         $group = WikiGroup::getGroup();
         $allGroups = $group->getAllGroupsIn();
@@ -61,10 +61,11 @@
             $output->pushContent(HTML::h2($g . " - members: " .
                     sizeof($members) . " - isMember: " . ($group->isMember($g) ? "yes" : "no")
             ));
+            $list = HTML::ul();
             foreach ($members as $m) {
-                $output->pushContent($m);
-                $output->pushContent(HTML::br());
+                $list->pushContent(HTML::li($m));
             }
+            $output->pushContent($list);
         }
         $output->pushContent(HTML::p("--- the end ---"));
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10228] trunk/lib/WikiUser.php

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

Revision: 10228
          http://sourceforge.net/p/phpwiki/code/10228
Author:   vargenau
Date:     2021-01-05 18:39:04 +0000 (Tue, 05 Jan 2021)
Log Message:
-----------
Already true

Modified Paths:
--------------
    trunk/lib/WikiUser.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2021-01-05 10:36:14 UTC (rev 10227)
+++ trunk/lib/WikiUser.php	2021-01-05 18:39:04 UTC (rev 10228)
@@ -720,7 +720,7 @@
         $UserName = $this->UserName();
 
         if (!$UserName) {
-            if (!$UserName and !headers_sent())
+            if (!headers_sent())
                 $request->deleteCookieVar(getCookieName());
             else
                 $this->_userid = $UserName;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10227] trunk/locale

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

Revision: 10227
          http://sourceforge.net/p/phpwiki/code/10227
Author:   vargenau
Date:     2021-01-05 10:36:14 +0000 (Tue, 05 Jan 2021)
Log Message:
-----------
Update locale

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/de.po	2021-01-05 10:36:14 UTC (rev 10227)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-31 17:34+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5092,13 +5092,6 @@
 msgid "Insufficient permissions."
 msgstr "Keine ausreichenden Zugangsrechte."
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr ""
-"Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt."
-
-msgid "Default preferences will be used."
-msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr "Die Länge des Passwortes ist kürzer als vom System gefordert."
 
@@ -5180,12 +5173,6 @@
 msgid "Home"
 msgstr "Start"
 
-msgid "About"
-msgstr "Über"
-
-msgid "HowTo"
-msgstr ""
-
 msgid "Info"
 msgstr "Info"
 
@@ -5220,6 +5207,9 @@
 msgid "Admin"
 msgstr "Admin"
 
+msgid "Preferences"
+msgstr "Voreinstellungen"
+
 msgid "Blog"
 msgstr "Blog"
 
@@ -5252,6 +5242,12 @@
 msgid "Edit Old Revision"
 msgstr "Alte Version Bearbeiten"
 
+msgid "Page Info"
+msgstr "Seiten Info"
+
+msgid "Page Dump"
+msgstr ""
+
 msgid "PurgeHtmlCache"
 msgstr "HtmlCacheSäubern"
 
@@ -5285,9 +5281,6 @@
 msgid "This is a minor change."
 msgstr "Kleinere Änderung."
 
-msgid "GoodStyle"
-msgstr "GuterStil"
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Siehe %s Tips fürs Edieren."
@@ -5295,9 +5288,6 @@
 msgid "HowToUseWiki"
 msgstr "WieManWikiBenutzt"
 
-msgid "Preferences"
-msgstr "Voreinstellungen"
-
 msgid "Today"
 msgstr "Heute"
 
@@ -5744,9 +5734,6 @@
 msgid "Last Difference"
 msgstr ""
 
-msgid "Page Info"
-msgstr "Seiten Info"
-
 msgid "Back Links"
 msgstr "Back Links"
 
@@ -5850,24 +5837,15 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Page info"
-msgstr "Seiten Info"
-
 msgid "Author history"
 msgstr ""
 
-msgid "Page dump"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr "HTML-Cachedatei Säubern"
 
-msgid "Copyrights"
-msgstr "Urheberrechte"
+msgid "About"
+msgstr "Über"
 
-msgid "GeneralDisclaimer"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr "Statistik über %s."
@@ -5935,12 +5913,6 @@
 msgid "My Preferences"
 msgstr "Meine Voreinstellungen"
 
-# (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
-# Änderungen"; in terms of newspapers or journalism it's traditionally
-# "NeuesteNachrichten" or much more better "DasNeueste").
-msgid "MyRecentChanges"
-msgstr ""
-
 msgid "My Changes"
 msgstr ""
 
@@ -5965,9 +5937,6 @@
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr "Ich mache nur kleinere Änderungen. Protokolliere stattdessen in %s."
 
-msgid "TermsOfUse"
-msgstr "BenutzungsBedingungen"
-
 # "ÄhnlicheSeiten" (LikePages sind keine SamePages; die korrekte
 # deutsche Übersetzung ist "ÄhnlicheSeiten" which would be the best.
 # Or in case "Ä" doesn't work as a WikiWord, then use "VergleichbareSeiten".
@@ -6007,6 +5976,9 @@
 msgid "Sidebar"
 msgstr "Sidebar"
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr ""
 
@@ -6013,6 +5985,27 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "GoodStyle"
+#~ msgstr "GuterStil"
+
+#~ msgid "Page info"
+#~ msgstr "Seiten Info"
+
+#~ msgid "Copyrights"
+#~ msgstr "Urheberrechte"
+
+#~ msgid "TermsOfUse"
+#~ msgstr "BenutzungsBedingungen"
+
+#~ msgid ""
+#~ "Empty Preferences or format of UserPreferences cookie not recognised."
+#~ msgstr ""
+#~ "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht "
+#~ "erkannt."
+
+#~ msgid "Default preferences will be used."
+#~ msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
+
 #~ msgid "Change owner of selected pages."
 #~ msgstr "Den Besitzer ausgewählte Seiten ändern."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/es.po	2021-01-05 10:36:14 UTC (rev 10227)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -4962,14 +4962,6 @@
 msgid "Insufficient permissions."
 msgstr "Permisos escasos."
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr ""
-"Preferencias o formato vacías de la galleta de UsuarioPreferencias no "
-"reconocido."
-
-msgid "Default preferences will be used."
-msgstr "Las preferencias del defecto serán utilizadas."
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 "La longitud de la contraseña es más corta que la política del sistema "
@@ -5052,12 +5044,6 @@
 msgid "Home"
 msgstr "PáginaPrincipal"
 
-msgid "About"
-msgstr ""
-
-msgid "HowTo"
-msgstr ""
-
 msgid "Info"
 msgstr "Informacion"
 
@@ -5092,6 +5078,9 @@
 msgid "Admin"
 msgstr ""
 
+msgid "Preferences"
+msgstr "Preferencias"
+
 msgid "Blog"
 msgstr ""
 
@@ -5124,6 +5113,12 @@
 msgid "Edit Old Revision"
 msgstr ""
 
+msgid "Page Info"
+msgstr "Informacion de la Pagina"
+
+msgid "Page Dump"
+msgstr "Descarge de la Página"
+
 msgid "PurgeHtmlCache"
 msgstr ""
 
@@ -5152,9 +5147,6 @@
 msgid "This is a minor change."
 msgstr "Esto es un cambio pequeño."
 
-msgid "GoodStyle"
-msgstr "BuenEstilo"
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s tips para editar."
@@ -5162,9 +5154,6 @@
 msgid "HowToUseWiki"
 msgstr ""
 
-msgid "Preferences"
-msgstr "Preferencias"
-
 msgid "Today"
 msgstr "Hoy"
 
@@ -5586,9 +5575,6 @@
 msgid "Last Difference"
 msgstr ""
 
-msgid "Page Info"
-msgstr "Informacion de la Pagina"
-
 msgid "Back Links"
 msgstr "Acoplamientos Traseros"
 
@@ -5686,24 +5672,15 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Page info"
-msgstr "Informacion de la Pagina"
-
 msgid "Author history"
 msgstr ""
 
-msgid "Page dump"
-msgstr "Descarge de la Página"
-
 msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Copyrights"
+msgid "About"
 msgstr ""
 
-msgid "GeneralDisclaimer"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5762,9 +5739,6 @@
 msgid "My Preferences"
 msgstr "Mis Preferencias"
 
-msgid "MyRecentChanges"
-msgstr "Mis Cambios Recientes"
-
 msgid "My Changes"
 msgstr "Mis Cambios"
 
@@ -5789,9 +5763,6 @@
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-msgid "TermsOfUse"
-msgstr ""
-
 msgid "View Page"
 msgstr ""
 
@@ -5825,6 +5796,9 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr ""
 
@@ -5831,6 +5805,27 @@
 msgid "Edit this page"
 msgstr "Corrija esta página"
 
+#~ msgid "GoodStyle"
+#~ msgstr "BuenEstilo"
+
+#~ msgid "Page info"
+#~ msgstr "Informacion de la Pagina"
+
+#~ msgid "Page dump"
+#~ msgstr "Descarge de la Página"
+
+#~ msgid "MyRecentChanges"
+#~ msgstr "Mis Cambios Recientes"
+
+#~ msgid ""
+#~ "Empty Preferences or format of UserPreferences cookie not recognised."
+#~ msgstr ""
+#~ "Preferencias o formato vacías de la galleta de UsuarioPreferencias no "
+#~ "reconocido."
+
+#~ msgid "Default preferences will be used."
+#~ msgstr "Las preferencias del defecto serán utilizadas."
+
 #~ msgid "DB admin user:"
 #~ msgstr "DB admin username:"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/fr.po	2021-01-05 10:36:14 UTC (rev 10227)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1353,7 +1353,8 @@
 "PageHistory-like list of a single page for only one user."
 msgstr ""
 "Affiche la liste de toutes les versions faites par un auteur, ou montre une "
-"liste du type HistoriqueDeLaPage pour une simple page uniquement pour un auteur."
+"liste du type HistoriqueDeLaPage pour une simple page uniquement pour un "
+"auteur."
 
 msgid "Minor"
 msgstr "Mineur"
@@ -1650,8 +1651,8 @@
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""
-"Sortie supprimée. Le greffon InfosSurLeFichier avec des fichiers locaux nécessite une "
-"page verrouillée."
+"Sortie supprimée. Le greffon InfosSurLeFichier avec des fichiers locaux "
+"nécessite une page verrouillée."
 
 msgid "page not locked"
 msgstr "page déverrouillée"
@@ -5062,12 +5063,6 @@
 msgid "Insufficient permissions."
 msgstr "Permissions insuffisantes."
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr "PréférencesUtilisateurs vides, le cookie peut être mal reconnu."
-
-msgid "Default preferences will be used."
-msgstr "Les préférences par défaut seront utilisées."
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
@@ -5146,12 +5141,6 @@
 msgid "Home"
 msgstr "Accueil"
 
-msgid "About"
-msgstr "À propos de"
-
-msgid "HowTo"
-msgstr "CommentFaire"
-
 msgid "Info"
 msgstr "Info"
 
@@ -5186,6 +5175,9 @@
 msgid "Admin"
 msgstr "Administration"
 
+msgid "Preferences"
+msgstr "Préférences"
+
 msgid "Blog"
 msgstr "Blog"
 
@@ -5218,6 +5210,12 @@
 msgid "Edit Old Revision"
 msgstr "Modifier l'ancienne version"
 
+msgid "Page Info"
+msgstr "Infos sur la page"
+
+msgid "Page Dump"
+msgstr "Cliché de la page"
+
 msgid "PurgeHtmlCache"
 msgstr "PurgerLeCache"
 
@@ -5250,9 +5248,6 @@
 msgid "This is a minor change."
 msgstr "Modification mineure."
 
-msgid "GoodStyle"
-msgstr "StyleCorrect"
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Voir les conseils pour éditer les pages dans %s."
@@ -5260,9 +5255,6 @@
 msgid "HowToUseWiki"
 msgstr "CommentUtiliserWiki"
 
-msgid "Preferences"
-msgstr "Préférences"
-
 msgid "Today"
 msgstr "Aujourd'hui"
 
@@ -5708,9 +5700,6 @@
 msgid "Last Difference"
 msgstr "Dernière différence"
 
-msgid "Page Info"
-msgstr "Infos sur la page"
-
 msgid "Back Links"
 msgstr "Pages liées"
 
@@ -5808,24 +5797,15 @@
 msgid "Special Actions"
 msgstr "Actions spéciales"
 
-msgid "Page info"
-msgstr "Infos sur la page"
-
 msgid "Author history"
 msgstr "Historique des auteurs"
 
-msgid "Page dump"
-msgstr "Cliché de la page"
-
 msgid "Purge HTML cache"
 msgstr "Vider le cache HTML"
 
-msgid "Copyrights"
-msgstr "Copyrights"
+msgid "About"
+msgstr "À propos de"
 
-msgid "GeneralDisclaimer"
-msgstr "ConditionsGénérales"
-
 #, php-format
 msgid "Statistics about %s."
 msgstr "Statistiques sur %s."
@@ -5884,9 +5864,6 @@
 msgid "My Preferences"
 msgstr "Mes préférences"
 
-msgid "MyRecentChanges"
-msgstr "MesChangementsRécents"
-
 msgid "My Changes"
 msgstr "Mes modifications"
 
@@ -5913,9 +5890,6 @@
 "Je ne fais que des modifications mineures. Veuillez rediriger les logs "
 "habituels vers %s."
 
-msgid "TermsOfUse"
-msgstr "Conditions d'utilisation"
-
 msgid "View Page"
 msgstr "Voir la page"
 
@@ -5951,6 +5925,9 @@
 msgid "Sidebar"
 msgstr "Barre latérale"
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr "Tutoriel"
 
@@ -5957,6 +5934,37 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "HowTo"
+#~ msgstr "CommentFaire"
+
+#~ msgid "GoodStyle"
+#~ msgstr "StyleCorrect"
+
+#~ msgid "Page info"
+#~ msgstr "Infos sur la page"
+
+#~ msgid "Page dump"
+#~ msgstr "Cliché de la page"
+
+#~ msgid "Copyrights"
+#~ msgstr "Copyrights"
+
+#~ msgid "GeneralDisclaimer"
+#~ msgstr "ConditionsGénérales"
+
+#~ msgid "MyRecentChanges"
+#~ msgstr "MesChangementsRécents"
+
+#~ msgid "TermsOfUse"
+#~ msgstr "Conditions d'utilisation"
+
+#~ msgid ""
+#~ "Empty Preferences or format of UserPreferences cookie not recognised."
+#~ msgstr "PréférencesUtilisateurs vides, le cookie peut être mal reconnu."
+
+#~ msgid "Default preferences will be used."
+#~ msgstr "Les préférences par défaut seront utilisées."
+
 #~ msgid "Permanently purge selected pages."
 #~ msgstr "Purger définitivement les pages sélectionnées."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/it.po	2021-01-05 10:36:14 UTC (rev 10227)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -4932,12 +4932,6 @@
 msgid "Insufficient permissions."
 msgstr "Permessi insufficienti."
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr ""
-
-msgid "Default preferences will be used."
-msgstr ""
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
@@ -5010,12 +5004,6 @@
 msgid "Home"
 msgstr "Principale"
 
-msgid "About"
-msgstr ""
-
-msgid "HowTo"
-msgstr ""
-
 msgid "Info"
 msgstr ""
 
@@ -5050,6 +5038,9 @@
 msgid "Admin"
 msgstr ""
 
+msgid "Preferences"
+msgstr "Preferenze"
+
 msgid "Blog"
 msgstr ""
 
@@ -5082,6 +5073,12 @@
 msgid "Edit Old Revision"
 msgstr ""
 
+msgid "Page Info"
+msgstr "Info Pagina"
+
+msgid "Page Dump"
+msgstr ""
+
 msgid "PurgeHtmlCache"
 msgstr "RimuoviDallaCacheHtml"
 
@@ -5110,9 +5107,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "GoodStyle"
-msgstr "BuonStile"
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Vedere %s consigli per le modifiche."
@@ -5120,9 +5114,6 @@
 msgid "HowToUseWiki"
 msgstr "ComeUsareWiki"
 
-msgid "Preferences"
-msgstr "Preferenze"
-
 msgid "Today"
 msgstr "Oggi"
 
@@ -5543,9 +5534,6 @@
 msgid "Last Difference"
 msgstr ""
 
-msgid "Page Info"
-msgstr "Info Pagina"
-
 msgid "Back Links"
 msgstr "Collegamenti Relativi"
 
@@ -5643,24 +5631,15 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Page info"
-msgstr "Info Pagina"
-
 msgid "Author history"
 msgstr ""
 
-msgid "Page dump"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr "RimuoviDallaCacheHtml"
 
-msgid "Copyrights"
+msgid "About"
 msgstr ""
 
-msgid "GeneralDisclaimer"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5719,9 +5698,6 @@
 msgid "My Preferences"
 msgstr ""
 
-msgid "MyRecentChanges"
-msgstr ""
-
 msgid "My Changes"
 msgstr ""
 
@@ -5746,9 +5722,6 @@
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-msgid "TermsOfUse"
-msgstr ""
-
 msgid "View Page"
 msgstr ""
 
@@ -5782,6 +5755,9 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr ""
 
@@ -5788,6 +5764,12 @@
 msgid "Edit this page"
 msgstr ""
 
+#~ msgid "GoodStyle"
+#~ msgstr "BuonStile"
+
+#~ msgid "Page info"
+#~ msgstr "Info Pagina"
+
 #~ msgid "Synopsis"
 #~ msgstr "Sommario"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/ja.po	2021-01-05 10:36:14 UTC (rev 10227)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4918,12 +4918,6 @@
 msgid "Insufficient permissions."
 msgstr ""
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr ""
-
-msgid "Default preferences will be used."
-msgstr ""
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
@@ -4996,12 +4990,6 @@
 msgid "Home"
 msgstr ""
 
-msgid "About"
-msgstr ""
-
-msgid "HowTo"
-msgstr ""
-
 msgid "Info"
 msgstr ""
 
@@ -5036,6 +5024,9 @@
 msgid "Admin"
 msgstr "管理"
 
+msgid "Preferences"
+msgstr ""
+
 msgid "Blog"
 msgstr ""
 
@@ -5068,6 +5059,12 @@
 msgid "Edit Old Revision"
 msgstr "古いリビジョンを編集する"
 
+msgid "Page Info"
+msgstr "ページ情報"
+
+msgid "Page Dump"
+msgstr ""
+
 msgid "PurgeHtmlCache"
 msgstr ""
 
@@ -5096,9 +5093,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "GoodStyle"
-msgstr ""
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr ""
@@ -5106,9 +5100,6 @@
 msgid "HowToUseWiki"
 msgstr ""
 
-msgid "Preferences"
-msgstr ""
-
 msgid "Today"
 msgstr "今日"
 
@@ -5529,9 +5520,6 @@
 msgid "Last Difference"
 msgstr ""
 
-msgid "Page Info"
-msgstr "ページ情報"
-
 msgid "Back Links"
 msgstr ""
 
@@ -5629,24 +5617,15 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Page info"
-msgstr "ページ情報"
-
 msgid "Author history"
 msgstr ""
 
-msgid "Page dump"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Copyrights"
+msgid "About"
 msgstr ""
 
-msgid "GeneralDisclaimer"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5705,9 +5684,6 @@
 msgid "My Preferences"
 msgstr ""
 
-msgid "MyRecentChanges"
-msgstr ""
-
 msgid "My Changes"
 msgstr ""
 
@@ -5732,9 +5708,6 @@
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-msgid "TermsOfUse"
-msgstr ""
-
 msgid "View Page"
 msgstr ""
 
@@ -5768,6 +5741,9 @@
 msgid "Sidebar"
 msgstr "スライドバー"
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr ""
 
@@ -5774,6 +5750,9 @@
 msgid "Edit this page"
 msgstr "ページを編集しています"
 
+#~ msgid "Page info"
+#~ msgstr "ページ情報"
+
 #~ msgid "See: %s"
 #~ msgstr "参照: %s"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/nl.po	2021-01-05 10:36:14 UTC (rev 10227)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -4924,12 +4924,6 @@
 msgid "Insufficient permissions."
 msgstr ""
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr ""
-
-msgid "Default preferences will be used."
-msgstr ""
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
@@ -5002,12 +4996,6 @@
 msgid "Home"
 msgstr "Thuis"
 
-msgid "About"
-msgstr ""
-
-msgid "HowTo"
-msgstr ""
-
 msgid "Info"
 msgstr ""
 
@@ -5042,6 +5030,9 @@
 msgid "Admin"
 msgstr ""
 
+msgid "Preferences"
+msgstr ""
+
 msgid "Blog"
 msgstr ""
 
@@ -5074,6 +5065,12 @@
 msgid "Edit Old Revision"
 msgstr ""
 
+msgid "Page Info"
+msgstr ""
+
+msgid "Page Dump"
+msgstr ""
+
 msgid "PurgeHtmlCache"
 msgstr ""
 
@@ -5102,9 +5099,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "GoodStyle"
-msgstr "GoedeStijl"
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s tips for veranderen."
@@ -5112,9 +5106,6 @@
 msgid "HowToUseWiki"
 msgstr ""
 
-msgid "Preferences"
-msgstr ""
-
 msgid "Today"
 msgstr ""
 
@@ -5535,9 +5526,6 @@
 msgid "Last Difference"
 msgstr ""
 
-msgid "Page Info"
-msgstr ""
-
 msgid "Back Links"
 msgstr "Terug Links"
 
@@ -5635,24 +5623,15 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Page info"
-msgstr ""
-
 msgid "Author history"
 msgstr ""
 
-msgid "Page dump"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Copyrights"
+msgid "About"
 msgstr ""
 
-msgid "GeneralDisclaimer"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5711,9 +5690,6 @@
 msgid "My Preferences"
 msgstr "Mijn Voorkeuren"
 
-msgid "MyRecentChanges"
-msgstr "MijnRecenteVeranderingen"
-
 msgid "My Changes"
 msgstr "Mijn Veranderingen"
 
@@ -5738,9 +5714,6 @@
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-msgid "TermsOfUse"
-msgstr ""
-
 msgid "View Page"
 msgstr ""
 
@@ -5774,6 +5747,9 @@
 msgid "Sidebar"
 msgstr "Zoek"
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr ""
 
@@ -5780,6 +5756,12 @@
 msgid "Edit this page"
 msgstr ""
 
+#~ msgid "GoodStyle"
+#~ msgstr "GoedeStijl"
+
+#~ msgid "MyRecentChanges"
+#~ msgstr "MijnRecenteVeranderingen"
+
 #~ msgid "Help/TextFormattingRules"
 #~ msgstr "Help/TekstFormatteringsRegels"
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/phpwiki.pot	2021-01-05 10:36:14 UTC (rev 10227)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4918,12 +4918,6 @@
 msgid "Insufficient permissions."
 msgstr ""
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr ""
-
-msgid "Default preferences will be used."
-msgstr ""
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
@@ -4996,12 +4990,6 @@
 msgid "Home"
 msgstr ""
 
-msgid "About"
-msgstr ""
-
-msgid "HowTo"
-msgstr ""
-
 msgid "Info"
 msgstr ""
 
@@ -5036,6 +5024,9 @@
 msgid "Admin"
 msgstr ""
 
+msgid "Preferences"
+msgstr ""
+
 msgid "Blog"
 msgstr ""
 
@@ -5068,6 +5059,12 @@
 msgid "Edit Old Revision"
 msgstr ""
 
+msgid "Page Info"
+msgstr ""
+
+msgid "Page Dump"
+msgstr ""
+
 msgid "PurgeHtmlCache"
 msgstr ""
 
@@ -5096,9 +5093,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "GoodStyle"
-msgstr ""
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr ""
@@ -5106,9 +5100,6 @@
 msgid "HowToUseWiki"
 msgstr ""
 
-msgid "Preferences"
-msgstr ""
-
 msgid "Today"
 msgstr ""
 
@@ -5529,9 +5520,6 @@
 msgid "Last Difference"
 msgstr ""
 
-msgid "Page Info"
-msgstr ""
-
 msgid "Back Links"
 msgstr ""
 
@@ -5629,24 +5617,15 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Page info"
-msgstr ""
-
 msgid "Author history"
 msgstr ""
 
-msgid "Page dump"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Copyrights"
+msgid "About"
 msgstr ""
 
-msgid "GeneralDisclaimer"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5705,9 +5684,6 @@
 msgid "My Preferences"
 msgstr ""
 
-msgid "MyRecentChanges"
-msgstr ""
-
 msgid "My Changes"
 msgstr ""
 
@@ -5732,9 +5708,6 @@
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-msgid "TermsOfUse"
-msgstr ""
-
 msgid "View Page"
 msgstr ""
 
@@ -5768,6 +5741,9 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/sv.po	2021-01-05 10:36:14 UTC (rev 10227)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -4919,12 +4919,6 @@
 msgid "Insufficient permissions."
 msgstr ""
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr ""
-
-msgid "Default preferences will be used."
-msgstr ""
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
@@ -4997,12 +4991,6 @@
 msgid "Home"
 msgstr "Framsida"
 
-msgid "About"
-msgstr ""
-
-msgid "HowTo"
-msgstr ""
-
 msgid "Info"
 msgstr ""
 
@@ -5037,6 +5025,9 @@
 msgid "Admin"
 msgstr ""
 
+msgid "Preferences"
+msgstr ""
+
 msgid "Blog"
 msgstr ""
 
@@ -5069,6 +5060,12 @@
 msgid "Edit Old Revision"
 msgstr ""
 
+msgid "Page Info"
+msgstr ""
+
+msgid "Page Dump"
+msgstr ""
+
 msgid "PurgeHtmlCache"
 msgstr ""
 
@@ -5097,9 +5094,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "GoodStyle"
-msgstr "BraStil"
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s: Redigeringstips."
@@ -5107,9 +5101,6 @@
 msgid "HowToUseWiki"
 msgstr ""
 
-msgid "Preferences"
-msgstr ""
-
 msgid "Today"
 msgstr ""
 
@@ -5530,9 +5521,6 @@
 msgid "Last Difference"
 msgstr ""
 
-msgid "Page Info"
-msgstr ""
-
 msgid "Back Links"
 msgstr ""
 
@@ -5630,24 +5618,15 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Page info"
-msgstr ""
-
 msgid "Author history"
 msgstr ""
 
-msgid "Page dump"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Copyrights"
+msgid "About"
 msgstr ""
 
-msgid "GeneralDisclaimer"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5706,9 +5685,6 @@
 msgid "My Preferences"
 msgstr "Mina Inställningar"
 
-msgid "MyRecentChanges"
-msgstr "MinaSenasteÄndringar"
-
 msgid "My Changes"
 msgstr "Mina Ändringar"
 
@@ -5733,9 +5709,6 @@
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-msgid "TermsOfUse"
-msgstr ""
-
 msgid "View Page"
 msgstr ""
 
@@ -5769,6 +5742,9 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr ""
 
@@ -5775,6 +5751,12 @@
 msgid "Edit this page"
 msgstr ""
 
+#~ msgid "GoodStyle"
+#~ msgstr "BraStil"
+
+#~ msgid "MyRecentChanges"
+#~ msgstr "MinaSenasteÄndringar"
+
 #~ msgid "Help/TextFormattingRules"
 #~ msgstr "Hjälp/Textformateringsregler"
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-01-05 09:56:40 UTC (rev 10226)
+++ trunk/locale/po/zh.po	2021-01-05 10:36:14 UTC (rev 10227)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2021-01-05 11:35+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -4937,12 +4937,6 @@
 msgid "Insufficient permissions."
 msgstr "權限不足."
 
-msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr "空的偏好設定或 UserPreferences cookie 格式無法辨認."
-
-msgid "Default preferences will be used."
-msgstr "預設偏好設定將被使用."
-
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
@@ -5020,12 +5014,6 @@
 msgid "Home"
 msgstr "首頁"
 
-msgid "About"
-msgstr ""
-
-msgid "HowTo"
-msgstr ""
-
 msgid "Info"
 msgstr ""
 
@@ -5060,6 +5048,9 @@
 msgid "Admin"
 msgstr "管理者"
 
+msgid "Preferences"
+msgstr "偏好設定"
+
 msgid "Blog"
 msgstr ""
 
@@ -5092,6 +5083,12 @@
 msgid "Edit Old Revision"
 msgstr "編輯舊的修訂"
 
+msgid "Page Info"
+msgstr ""
+
+msgid "Page Dump"
+msgstr ""
+
 msgid "PurgeHtmlCache"
 msgstr ""
 
@@ -5120,9 +5117,6 @@
 msgid "This is a minor change."
 msgstr "這是次要變更."
 
-msgid "GoodStyle"
-msgstr ""
-
 #, php-format
 msgid "See %s tips for editing."
 msgstr "參照編輯時的 %s 小秘訣."
@@ -5130,9 +5124,6 @@
 msgid "HowToUseWiki"
 msgstr ""
 
-msgid "Preferences"
-msgstr "偏好設定"
-
 msgid "Today"
 msgstr "今天"
 
@@ -5559,9 +5550,6 @@
 msgid "Last Difference"
 msgstr ""
 
-msgid "Page Info"
-msgstr ""
-
 msgid "Back Links"
 msgstr ""
 
@@ -5659,24 +5647,15 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Page info"
-msgstr ""
-
 msgid "Author history"
 msgstr "作者歷程"
 
-msgid "Page dump"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Copyrights"
+msgid "About"
 msgstr ""
 
-msgid "GeneralDisclaimer"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr "關於 %s 的統計."
@@ -5735,9 +5714,6 @@
 msgid "My Preferences"
 msgstr "我的偏好設定"
 
-msgid "MyRecentChanges"
-msgstr ""
-
 msgid "My Changes"
 msgstr ""
 
@@ -5762,9 +5738,6 @@
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr "我正在做次要編輯. 請轉移常用日誌到替代的 %s."
 
-msgid "TermsOfUse"
-msgstr ""
-
 msgid "View Page"
 msgstr ""
 
@@ -5798,6 +5771,9 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "News"
+msgstr ""
+
 msgid "Tutorial"
 msgstr ""
 
@@ -5804,6 +5780,13 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid ""
+#~ "Empty Preferences or format of UserPreferences cookie not recognised."
+#~ msgstr "空的偏好設定或 UserPreferences cookie 格式無法辨認."
+
+#~ msgid "Default preferences will be used."
+#~ msgstr "預設偏好設定將被使用."
+
 #~ msgid "Permanently remove all selected pages."
 #~ msgstr "永久移除選定的頁面."
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10226] trunk/themes

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

Revision: 10226
          http://sourceforge.net/p/phpwiki/code/10226
Author:   vargenau
Date:     2021-01-05 09:56:40 +0000 (Tue, 05 Jan 2021)
Log Message:
-----------
Use "__" where appropriate

Modified Paths:
--------------
    trunk/themes/Crao/templates/actionbar.tmpl
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Crao/templates/navbar.tmpl
    trunk/themes/MonoBook/templates/actionbar.tmpl
    trunk/themes/MonoBook/templates/browse-footer.tmpl
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/MonoBook/templates/signin.tmpl
    trunk/themes/Portland/templates/actionbar.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Portland/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/actionbar.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/signin.tmpl
    trunk/themes/Wordpress/templates/actionbar.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/blog/templates/actionbar.tmpl
    trunk/themes/blog/templates/info.tmpl
    trunk/themes/blog/templates/navbar.tmpl
    trunk/themes/blog/templates/sidebar.tmpl
    trunk/themes/default/templates/actionbar.tmpl
    trunk/themes/default/templates/blogform.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/default/templates/navbar.tmpl
    trunk/themes/fusionforge/templates/actionbar.tmpl
    trunk/themes/shamino_com/templates/actionbar.tmpl
    trunk/themes/shamino_com/templates/browse-footer.tmpl
    trunk/themes/smaller/templates/actionbar.tmpl
    trunk/themes/smaller/templates/info.tmpl
    trunk/themes/smaller/templates/navbar.tmpl
    trunk/themes/wikilens/templates/navbar.tmpl

Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Crao/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -17,13 +17,13 @@
 <?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?>
 <?php echo $SEP?><?php echo Button('remove') ?>
 <?php } ?>
-<?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
+<?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
 <?php echo $SEP?><?php echo Button("diff") ?>
-<?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?>
+<?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?>
 <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
 <?php // Buttons really only for debugging ?>
-<?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?>
-<?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
+<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?>
+<?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
 <?php $purgeb = Button(array('nocache' => 'purge'),
                        _("PurgeHtmlCache"), $page->getName());
       $purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Crao/templates/editpage.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -56,7 +56,7 @@
 <hr />
 <div class="wiki-edithelp">
 <?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
 <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>

Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Crao/templates/navbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -9,17 +9,17 @@
 <div id="navbuttons">
 <table class="fullwidth">
 <tr class="middle"><td class="align-left">
-<?php echo WikiLink(_("RecentChanges"), "button") ?>
+<?php echo WikiLink(__("RecentChanges"), "button") ?>
 <?php if (!empty($revision)) { ?>
-<?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?>
-<?php echo $SEP?><?php echo Button(_("LikePages"), _("LikePages")) ?>
-<?php echo $SEP?><?php echo Button(_("BackLinks"), _("BackLinks")) ?>
+<?php echo $SEP?><?php echo Button(__("RelatedChanges"), _("RelatedChanges")) ?>
+<?php echo $SEP?><?php echo Button(__("LikePages"), _("LikePages")) ?>
+<?php echo $SEP?><?php echo Button(__("BackLinks"), _("BackLinks")) ?>
 <?php } ?>
 </td>
 <td class="align-right; width:150px">
    <div id="search">
     <?php if (!empty($user) && $user->isSignedIn()) { ?>
-    <?php echo WikiLink(_("UserPreferences"), 'button', _("Preferences")) ?>
+    <?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?>
     <?php echo $SEP?>
 <?php } ?>
 <?php if (!empty($user)) { ?>
@@ -35,10 +35,10 @@
 <?php echo $SEP?>
 <?php } ?>
 <?php if (!empty($user) && $user->isAdmin()) { ?>
-<?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?>
+<?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?>
 <?php } ?>
 <?php } ?>
-<?php echo WikiLink(_("FindPage"), "button") ?><input type="text" id="livesearch" name="s" size="12"
+<?php echo WikiLink(__("FindPage"), "button", _("FindPage")) ?><input type="text" id="livesearch" name="s" size="12"
    maxlength="256"
    onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
    onmouseout="window.status=''; return true;"

Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -25,7 +25,7 @@
     <?php } else {
       $talk = new WikiPageName($pagename); ?>
       <?php echo ActionButton(array(),$isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page")) ?>
-      <?php echo ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
+      <?php echo ActionButton(array(), _("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
     <?php } ?>
     <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?>
     <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false,
@@ -36,7 +36,7 @@
 
     <?php if ($dbh->isWikiPage($page->getName())) { ?>
 
-      <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page.")) ?>
+      <?php echo ActionButton(__("PageHistory"), _("History"), false, array('title'=>"Past versions of this page.")) ?>
 
       <?php if (!empty($revision) and ($isAdmin or mayAccessPage('purge', $pagename))) { ?>
         <?php echo ActionButton("purge") ?>
@@ -72,10 +72,10 @@
       <?php echo ActionButton('remove') ?>
      <?php } ?>
     <?php } ?>
-    <?php echo ActionButton(array('action'=>_("PageInfo")), _("Page info"), $pagename) ?>
-    <?php echo ActionButton(array('action'=>_("AuthorHistory")), _("Author history"), $pagename) ?>
+    <?php echo ActionButton(array('action'=>__("PageInfo")), _("Page Info"), $pagename) ?>
+    <?php echo ActionButton(array('action'=>__("AuthorHistory")), _("Author history"), $pagename) ?>
     <?php echo ActionButton("diff") ?>
-    <?php echo ActionButton(array('action'=>_("PageDump")), _("Page dump"), $pagename) ?>
+    <?php echo ActionButton(array('action'=>__("PageDump")), _("Page Dump"), $pagename) ?>
     <?php if (DEBUG and USECACHE) {
       $PurgeCache = ActionButton(array('nocache' => 'purge'),
                      _("Purge HTML cache"), $pagename);

Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -5,20 +5,20 @@
     <ul id="f-list">
       <li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li>
       <li id="f-copyright">All text is available under the terms of the <a class="internal" href="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License</a> (see <b>
-<?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?>
-      <?php echo WikiLink(_("Copyrights")) ?>
+<?php if ($request->_dbi->isWikiPage(__("Copyrights"))) { ?>
+      <?php echo WikiLink(__("Copyrights")) ?>
 <?php } else { ?>
       <a class="internal" href="http://phpwiki.demo.free.fr/index.php/Copyrights">Copyrights</a>
 <?php } ?>
 </b> for details).<br /></li>
-<?php if ($request->_dbi->isWikiPage(_("About".WIKI_NAME))) { ?>
-      <?php echo WikiLink(_("About".WIKI_NAME)) ?>
+<?php if ($request->_dbi->isWikiPage(__("About").WIKI_NAME)) { ?>
+      <?php echo WikiLink(_("About").WIKI_NAME) ?>
 <?php } else { ?>
       <li id="f-about"><a href="http://phpwiki.demo.free.fr/index.php/Help/PhpWiki">About PhpWiki</a></li>
 <?php } ?>
       <li id="f-disclaimer">
-<?php if ($request->_dbi->isWikiPage(_("GeneralDisclaimer"))) { ?>
-      <?php echo WikiLink(_("GeneralDisclaimer")) ?>
+<?php if ($request->_dbi->isWikiPage(__("GeneralDisclaimer"))) { ?>
+      <?php echo WikiLink(__("GeneralDisclaimer")) ?>
 <?php } else { ?>
       <a href="http://phpwiki.demo.free.fr/index.php/GeneralDisclaimer">Disclaimer</a>
 <?php } ?>

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/info.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -169,14 +169,14 @@
 
 <div id="actionbuttons">
     <?php echo Button("viewsource", _("View Source")) ?>
-    <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
-    <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
+    <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?>
     <?php echo $SEP?><?php echo Button("Diff") ?>
     <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
     <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
 <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
     <?php // Buttons really only for debugging ?>
-    <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?>
+    <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?>
 <?php
      $PurgeCache = Button(array('nocache' => 'purge'),
                      _("PurgeHtmlCache"), $page->getName());

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -10,13 +10,13 @@
   <h2><?php echo _("Navigation") ?></h2>
   <div class="pBody">
     <ul>
-      <li><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li>
-      <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li>
-      <li><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li>
-      <li><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li>
-      <li><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li>
-      <li><?php echo WikiLink(_("RandomPage"), "",_("Random Page")) ?></li>
-      <li><?php echo WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li>
+      <li><?php echo WikiLink(HOME_PAGE, "", _("Home Page")) ?></li>
+      <li><?php $link = WikiLink(__("RecentChanges"), "", _("Recent changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li>
+      <li><?php echo WikiLink(__("RecentComments"), "", _("Recent comments")) ?></li>
+      <li><?php echo WikiLink(__("RecentNewPages"), "", _("Recent new pages")) ?></li>
+      <li><?php echo Button(array('action'=>__("LikePages")),_("Like pages"), $page->getName()) ?></li>
+      <li><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li>
+      <li><?php echo WikiLink(__("PhpWikiDocumentation"),"", _("Help")) ?></li>
     </ul>
   </div>
 </div>
@@ -26,13 +26,13 @@
   <h2><?php echo _("Search") ?></h2>
   <div class="pBody">
 <?php echo Template("search",
-             array('SEARCH_BEFORE' => WikiLink(_("FindPage"), "",_("Find page")),
+             array('SEARCH_BEFORE' => WikiLink(__("FindPage"), "", _("Find page")),
            'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton',
                                'type'=>'submit',
                                'value'=>_("Go"))))) ?>
 <!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>"
       method="get" accept-charset="UTF-8">
-      <?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?>
+      <?php echo WikiLink(__("FindPage"), "searchButton", _("Search:")) ?>
       <input type="hidden" name="auto_redirect" value="1" />
       <input type="text"  name="s" size="12" maxlength="256"
           title='<?php echo _("Quick Search")?>'
@@ -49,16 +49,16 @@
   <div class="pBody">
     <ul>
     <?php if ($revision) { ?>
-      <li><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
+      <li><?php echo Button(array('action'=>__("BackLinks")), _("What links here"), $page->getName()) ?></li>
     <?php } ?>
     <?php $links = $page->getPageLinks(); if ($links->count() > 1) { ?>
-      <li><?php echo $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li>
+      <li><?php echo $WikiTheme->makeLinkButton($revision, _("Related changes"), __("RelatedChanges")) ?></li>
     <?php } ?>
     <?php if ($user->isAdmin()) { ?>
-      <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
+      <li><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Administration")) ?></li>
     <?php } ?>
     <?php if ($user->isSignedIn()) { ?>
-      <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
+      <li><?php $link = WikiLink(__("UpLoad"), "", _("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
     <?php } ?>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
 <script type="text/javascript"><!--
@@ -70,7 +70,7 @@
       ?>
       <li><?php echo $btn ?></li>
     <?php } ?>
-    <li><?php echo WikiLink(_("AllPages"), "",_("All pages")) ?></li>
+    <li><?php echo WikiLink(__("AllPages"), "", _("All pages")) ?></li>
   </ul>
   </div>
 </div>

Modified: trunk/themes/MonoBook/templates/signin.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/signin.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/signin.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -5,9 +5,9 @@
  <ul>
   <?php if ($user->isAuthenticated()) { ?>
   <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
-  <li><?php echo WikiLink($id . "/Discussion", 'auto' ,_("My Discussion")) ?></li>
-  <li><?php echo WikiLink(_("UserPreferences"), "",_("My Preferences")) ?></li>
-  <li><?php echo WikiLink(_("MyRecentChanges"), "",_("My Changes")) ?></li>
+  <li><?php echo WikiLink($id . "/Discussion", 'auto' , _("My Discussion")) ?></li>
+  <li><?php echo WikiLink(__("UserPreferences"), "", _("My Preferences")) ?></li>
+  <li><?php echo WikiLink(__("MyRecentChanges"), "", _("My Changes")) ?></li>
   <li><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'),$sp,_("Logout"),$sp) ?></li>
   <?php } else { ?>
   <?php // Login or Register ?>

Modified: trunk/themes/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Portland/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -9,9 +9,9 @@
 ?>
 <?php echo $EditB ?>
 <a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
-    <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
-    <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?>
 <?php if (defined('DEBUG') && DEBUG || $user->isAdmin()) { ?>
-    <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php // For debugging only, really ?>
+    <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> <?php // For debugging only, really ?>
 <?php } ?>
 <br />

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Portland/templates/editpage.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -26,7 +26,7 @@
 <br />
 <?php echo $MINOR_EDIT_CB ?>
 <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
-        WikiLink(_("RecentEdits"))) ?>
+        WikiLink(__("RecentEdits"))) ?>
 <br />
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <hr />
@@ -37,7 +37,7 @@
 
 <div class="wiki-edithelp">
 <?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
 <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>

Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Portland/templates/navbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -1,12 +1,12 @@
 <nav role="navigation" aria-label="<?php echo _("Main Menu") ?>">
 <?php // The bottom navigation/search bar ?>
 
-    <?php echo WikiLink(_("FindPage"), "button") ?> by searching
+    <?php echo WikiLink(__("FindPage"), "button") ?> by searching
     <?php if ($revision) { ?>
-      (or browse <?php echo Button(_("LikePages"), _("LikePages")) ?>)
+      (or browse <?php echo Button(__("LikePages"), _("LikePages")) ?>)
     <?php } ?>
     <?php if ($user->isAdmin()) { ?>
-     <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock')?>
+     <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
      <?php echo $SEP?><?php echo Button('remove') ?>
     <?php } ?>
    <hr />
@@ -13,9 +13,9 @@
 <table class="toolbar fullwidth" id="actionbar">
 <tr class="baseline">
   <td>
-   <?php echo WikiLink(_("RecentChanges"), "button") ?>
+   <?php echo WikiLink(__("RecentChanges"), "button") ?>
     <?php if ($user->isAdmin()) { ?>
-     <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button") ?>
+     <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button") ?>
     <?php } ?>
   </td>
   <td class="align-right">

Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -23,10 +23,10 @@
     <?php } elseif ($page->exists()) { ?>
       <?php echo ActionButton("viewsource", _("View Source")) ?>
     <?php } ?>
-    <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>_("Past versions of this page."))) ?>
+    <?php echo ActionButton(__("PageHistory"), _("History"), false, array('title'=>_("Past versions of this page."))) ?>
     <?php echo ActionButton("diff") ?>
     <?php if ($user->isSignedIn()) { ?>
-      <?php echo ActionButton(_("WatchPage"), _("Watch"), false,
+      <?php echo ActionButton(__("WatchPage"), _("Watch"), false,
                array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes"))) ?>
     <?php } ?>
   </ul>
@@ -54,12 +54,12 @@
        <?php echo ActionButton('setacl') ?>
      <?php }} ?>
      <?php echo ActionButton("viewsource", _("View Source")) ?>
-     <?php echo ActionButton(array('action'=>'PageInfo'), _("PageInfo"), $pagename) ?>
-     <?php echo ActionButton(_("AuthorHistory")) ?>
-     <?php echo ActionButton(_("PageHistory")) ?>
+     <?php echo ActionButton(array('action'=>__('PageInfo')), _("Page Info"), $pagename) ?>
+     <?php echo ActionButton(__("AuthorHistory"), _("AuthorHistory")) ?>
+     <?php echo ActionButton(__("PageHistory"), _("PageHistory")) ?>
      <?php echo ActionButton("diff") ?>
      <?php if ($isAdmin) { ?>
-      <?php echo ActionButton(_("PageDump")) ?>
+      <?php echo ActionButton(__("PageDump"), _("Page Dump")) ?>
       <?php if (USECACHE) { ?>
        <?php echo ActionButton(array('nocache' => 'purge'), _("PurgeHtmlCache"), $pagename,
                array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -10,9 +10,9 @@
   <div class="_pBody">
     <ul>
       <li><?php echo WikiLink(HOME_PAGE) ?></li>
-      <li><?php echo WikiLink("Help:HowToUseWiki","auto","How to use this Wiki") ?></li>
-      <li><?php echo WikiLink("Help:AddingPages","auto","Adding Pages") ?></li>
-      <li><?php echo WikiLink("CategoryCategory","auto","List all Categories") ?></li>
+      <li><?php echo WikiLink("Help:HowToUseWiki", "auto", "How to use this Wiki") ?></li>
+      <li><?php echo WikiLink("Help:AddingPages", "auto", "Adding Pages") ?></li>
+      <li><?php echo WikiLink("CategoryCategory", "auto", "List all Categories") ?></li>
     </ul>
   </div>
 </div>
@@ -23,8 +23,8 @@
   <h2><?php echo _("Main Categories")?></h2>
   <div class="pBody">
     <ul>
-      <li><?php echo WikiLink("CategoryWikiPlugin") ?></li>
-      <li><?php echo WikiLink("CategoryActionPage") ?></li>
+      <li><?php echo WikiLink(__("CategoryWikiPlugin")) ?></li>
+      <li><?php echo WikiLink(__("CategoryActionPage")) ?></li>
     </ul>
   </div>
 </div>
@@ -34,7 +34,7 @@
   <h2><?php echo _("Search")?></h2>
   <div class="pBody">
 <?php echo Template("search",
-             array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(_("FindPage")))*/,
+             array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(__("FindPage")))*/,
              'SEARCH_AFTER'  => HTML::raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" />&nbsp;<input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?>
   </div>
 </div>
@@ -44,14 +44,14 @@
       <h2><?php echo _("Toolbox") ?><?php echo $WikiTheme->folderArrow('p-tb', 'Open') ?></h2>
   <div class="pBody" id="p-tb-body">
     <ul>
-    <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?> </li>
-    <li><?php echo WikiLink(_("RecentNewPages")) ?></li>
+    <li><?php $link = WikiLink(__("RecentChanges"), "", _("Recent Changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?> </li>
+    <li><?php echo WikiLink(__("RecentNewPages")) ?></li>
     <?php if (!empty($revision)) { ?>
-      <li><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
+      <li><?php echo Button(array('action'=>__("BackLinks")), _("What links here"), $page->getName()) ?></li>
     <?php } ?>
     <?php if (!empty($user) && $user->isSignedIn()) { ?>
-      <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
-      <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
+      <li><?php $link = WikiLink(__("UpLoad"), "", _("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
+      <li><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?></li>
     <?php } ?>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
 <script type="text/javascript"><!--
@@ -61,11 +61,11 @@
       // Do not display the pdf icon
       $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');
       ?>
-      <li><?php echo $btn ?> &nbsp;&nbsp; <?php echo WikiLink("Help:PDF","",HTML::img(array('src'=>$WikiTheme->_findData('images/mini_help.png'),'width'=>12,'height'=>13,'alt'=>'PDF help','title'=>'PDF help'))) ?></li>
+      <li><?php echo $btn ?> &nbsp;&nbsp; <?php echo WikiLink("Help:PDF", "", HTML::img(array('src'=>$WikiTheme->_findData('images/mini_help.png'),'width'=>12,'height'=>13,'alt'=>'PDF help','title'=>'PDF help'))) ?></li>
     <?php } ?>
-    <li><?php echo WikiLink(_("AllPages")) ?></li>
+    <li><?php echo WikiLink(__("AllPages"), "", _("All pages")) ?></li>
     <?php if (!empty($user) && $user->isAdmin()) { ?>
-      <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
+      <li><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Administration")) ?></li>
     <?php } ?>
   </ul>
   </div>

Modified: trunk/themes/Sidebar/templates/signin.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/signin.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Sidebar/templates/signin.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -2,8 +2,8 @@
 <div class="portlet" id="p-personal"><div class="pBody"><ul>
 <?php if ($user->isAuthenticated()) {
      $sp = HTML::raw("&nbsp;"); $id = $user->getAuthenticatedId(); ?>
-     <li id="pt-mypages"><?php echo WikiLink("RecentChangesMyPages", 'auto', HTML($sp,"MyPages",$sp)) ?></li>
-     <li id="pt-mychanges"><?php echo WikiLink("MyRecentChanges", 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
+     <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li>
+     <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
      <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
      <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li>
 <?php } elseif (ALLOW_ANON_USER) {

Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -15,14 +15,14 @@
    <li><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME ?></a>
      <ul>
        <li>
-         <?php echo WikiLink(_("HomePage"), "button") ?>
+         <?php echo WikiLink(__("HomePage"), "button") ?>
        </li>
        <li>
-         <?php echo WikiLink(_("RecentChanges"), "button") ?>
+         <?php echo WikiLink(__("RecentChanges"), "button") ?>
        </li>
        <?php if (!empty($user) && $user->isAdmin()) { ?>
        <li>
-       <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button") ?>
+       <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button") ?>
        </li>
        <?php } ?>
        <?php if (!empty($user)) { ?>
@@ -54,7 +54,7 @@
         <?php } ?>
        <?php } ?>
        <?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?>
-        <li><?php echo $SEP?><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
+        <li><?php echo $SEP?><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
         <li><?php echo $SEP?><?php echo Button('remove') ?></li>
        <?php } ?>
      </ul>
@@ -66,13 +66,13 @@
          <?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
        </li>
        <li>
-         <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?><?php echo $SEP?>
+         <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?><?php echo $SEP?>
        </li>
-       <li> <?php echo Button("PageInfo", _("PageInfo")) ?> </li>
+       <li> <?php echo Button(__("PageInfo"), _("Page Info")) ?> </li>
          <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
          <li>
-           <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php // For debugging only, really ?>
-           <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
+           <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> <?php // For debugging only, really ?>
+           <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
          </li>
          <?php } ?>
      </ul>
@@ -87,7 +87,7 @@
        </li>
        <li>
          <?php if ($revision) { ?>
-           <?php echo Button(_("LikePages"), _("LikePages")) ?>
+           <?php echo Button(__("LikePages"), _("LikePages")) ?>
          <?php } ?>
        </li>
      </ul>

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -39,7 +39,7 @@
 <?php echo $MINOR_EDIT_CB ?>
   <label for="edit-minor_edit">
   <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
-        WikiLink(_("RecentEdits"))) ?></label>
+        WikiLink(__("RecentEdits"))) ?></label>
 <br />
   <?php if ($user->isAdmin()) { ?>
     <?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
@@ -54,7 +54,7 @@
 
 <div class="wiki-edithelp">
 <?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
 <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>

Modified: trunk/themes/blog/templates/actionbar.tmpl
===================================================================
--- trunk/themes/blog/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/blog/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -3,16 +3,16 @@
   <td>
   <div class="actionbuttons">
     <?php echo WikiLink(HOME_PAGE, "known",_("Home")) ?>
-    <?php echo $SEP?><?php echo WikiLink(_("About")) ?>
-    <?php echo $SEP?><?php echo WikiLink(_("BlogArchives"),'',_("Archives")) ?>
-    <?php echo $SEP?><?php echo WikiLink(_("PhotoAlbum")) ?>
-    <?php echo $SEP?><?php echo WikiLink(_("HowTo")) ?>
-    <?php echo $SEP?><?php echo WikiLink(_("RecentChanges")) ?>
-    <?php echo $SEP?><?php echo Button("PageInfo", _("Info")) ?>
+    <?php echo $SEP?><?php echo WikiLink(__("About")) ?>
+    <?php echo $SEP?><?php echo WikiLink(__("BlogArchives"), '', _("Archives")) ?>
+    <?php echo $SEP?><?php echo WikiLink(__("PhotoAlbum")) ?>
+    <?php echo $SEP?><?php echo WikiLink(__("HowTo")) ?>
+    <?php echo $SEP?><?php echo WikiLink(__("RecentChanges")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Info")) ?>
 <?php
 if ($user->isAuthenticated()) {
     if (mayAccessPage('edit', $page->getName()))
-        $EditB = Button("edit",_("Edit"),false,array('id'=>'btn-edit'));
+        $EditB = Button("edit", _("Edit"), false, array('id'=>'btn-edit'));
     else
         $EditB = Button("viewsource", _("View Source"));
 ?>

Modified: trunk/themes/blog/templates/info.tmpl
===================================================================
--- trunk/themes/blog/templates/info.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/blog/templates/info.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -1,6 +1,6 @@
 <?php echo Template("default/info") ?>
 <div class="actionbuttons">
-  <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?>
+  <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?>
   <?php echo $SEP?><?php echo Button("Diff") ?>
   <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
   <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>

Modified: trunk/themes/blog/templates/navbar.tmpl
===================================================================
--- trunk/themes/blog/templates/navbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/blog/templates/navbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -7,13 +7,13 @@
 <div class="box-data">
 <ul>
 <?php if (!empty($revision)) { ?>
-<li><?php echo WikiLink(_("BackLinks"), "button",_("BackLinks")) ?></li>
+<li><?php echo WikiLink(__("BackLinks"), "button",_("BackLinks")) ?></li>
 <?php } ?>
 <?php if (!empty($user) && $user->isAdmin()) { ?>
-<li><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?></li>
+<li><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?></li>
 <?php } ?>
 <?php if (!empty($user) && $user->isSignedIn()) { ?>
-<li><?php echo WikiLink(_("UserPreferences"), "","Preferences") ?></li>
+<li><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?></li>
 <?php } ?>
 </ul>
 <?php echo Template("blog/signin") ?>

Modified: trunk/themes/blog/templates/sidebar.tmpl
===================================================================
--- trunk/themes/blog/templates/sidebar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/blog/templates/sidebar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -9,7 +9,7 @@
   }
 ?>
 <div class="box">
-<div class="box-title"><?php echo WikiLink($UserCalPageTitle,'known',_("Calendar")) ?></div>
+<div class="box-title"><?php echo WikiLink($UserCalPageTitle, 'known', _("Calendar")) ?></div>
 <div class="box-data">
     <?php echo Template('calendar') ?>
 </div></div>

Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/default/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -20,16 +20,16 @@
       <?php echo $SEP?><?php echo Button('rename') ?>
     <?php }} ?>
     <?php if ($revision and ($user->isAdmin() or mayAccessPage('remove', $page->getName()))) { ?>
-      <?php echo $SEP?><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
+      <?php echo $SEP?><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
       <?php echo $SEP?><?php echo Button('remove') ?>
     <?php } ?>
-    <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
     <?php echo $SEP?><?php echo Button("diff") ?>
-    <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?>
 <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
     <?php // Buttons really only for debugging ?>
-    <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?>
-    <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
+    <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
 <?php
     if (DEBUG & _DEBUG_SQL and USECACHE) {
       $PurgeCache = Button(array('nocache' => 'purge'),
@@ -41,7 +41,7 @@
     <?php // End debugging buttons ?>
 <?php } ?>
 <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
-      <?php echo $SEP?><?php echo Button("pdf","Pdf",'wikiclear',array('id'=>'btn-pdf')) ?>
+      <?php echo $SEP?><?php echo Button("pdf", "Pdf", 'wikiclear', array('id'=>'btn-pdf')) ?>
 <?php } ?>
   </div>
   </td>

Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/default/templates/blogform.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -21,7 +21,7 @@
 
 <hr />
 <div class="wiki-edithelp">
-  <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+  <p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
   <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/default/templates/editpage.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -74,6 +74,6 @@
 <hr />
 <div class="wiki-edithelp">
 <?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
 <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>

Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/default/templates/navbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -7,21 +7,21 @@
     <?php echo $SEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()),
                'button', _("Discussion")) ?>
   <?php } else { ?>
-    <?php echo $SEP?><?php echo Button(array(),_("Article"),$page->getName()) ?>
+    <?php echo $SEP?><?php echo Button(array(),_("Article"), $page->getName()) ?>
   <?php } ?>
   <?php echo $SEP?>
 <?php } ?>
-<?php echo WikiLink(_("RecentChanges"), "button") ?>
+<?php echo WikiLink(__("RecentChanges"), "button") ?>
 <?php echo $SEP?><?php echo Template('search',
            array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
 ?>
 <?php if (!empty($revision)) { ?>
-<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"), _("LikePages")) ?>
-<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"), _("BackLinks")) ?>
+<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"), __("LikePages")) ?>
+<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"), __("BackLinks")) ?>
 <?php } ?>
 <?php if (!empty($user) && $user->isSignedIn()) { ?>
 <?php echo $SEP?>
-<?php echo WikiLink(_("UserPreferences"), 'button', _("Preferences")) ?>
+<?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?>
 <?php } ?>
 <?php if (!empty($user)) { ?>
 <?php
@@ -37,7 +37,7 @@
 <?php } ?>
 <?php } ?>
 <?php if (!empty($user) && $user->isAdmin()) { ?>
-<?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?>
+<?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?>
 <?php } ?></div>
 <?php if (DEBUG & 2) {
         if (isset($links)) {

Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -67,7 +67,7 @@
 
       <li><?php echo Button(__("PageInfo"), _("Page Info")) ?></li>
 
-      <li><?php echo Button(array('action'=>__("BackLinks")), _("Back Links"),$page->getName()) ?></li>
+      <li><?php echo Button(array('action'=>__("BackLinks")), _("Back Links"), $page->getName()) ?></li>
 
     <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
       <?php if ($curuserprefs->get('pdfMenuItem')) { ?>

Modified: trunk/themes/shamino_com/templates/actionbar.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/shamino_com/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -2,7 +2,7 @@
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 ?>
-<?php echo Button(array('action'=>'PageInfo'),_("PageInfo"),$page->getName()) ?>
+<?php echo Button(array('action'=>__('PageInfo')), _("Page Info"),$page->getName()) ?>
 <?php echo $SEP?><?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
 <?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
   <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
@@ -15,11 +15,11 @@
    <?php echo $SEP?><?php echo Button('remove') ?>
 <?php } ?>
 <?php if (!empty($user) && $user->isAdmin()) { ?>
-  <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "","Admin") ?>
+  <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Admin")) ?>
   <?php // Buttons really only for debugging. See info for more ?>
-  <?php echo $SEP?><?php echo Button(_("PageHistory")) ?>
+  <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
   <?php echo $SEP?><?php echo Button("diff") ?>
-  <?php echo $SEP?><?php echo Button(_("PageDump")) ?>
+  <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
   <?php // End debugging buttons ?>
 <?php } ?>
 </nav>

Modified: trunk/themes/shamino_com/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/browse-footer.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/shamino_com/templates/browse-footer.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -5,5 +5,5 @@
 <?php } ?>
   <span class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></span>
 <br />
-<a href="<?php echo PHPWIKI_BASE_URL ?>"><?php echo WIKI_NAME?></a> created with <a href="http://phpwiki.demo.free.fr">PhpWiki</a> © 1998-2007 | <?php echo WikiLink(_("TermsOfUse")) ?>
+<a href="<?php echo PHPWIKI_BASE_URL ?>"><?php echo WIKI_NAME?></a> created with <a href="http://phpwiki.demo.free.fr">PhpWiki</a> © 1998-2007 | <?php echo WikiLink(__("TermsOfUse")) ?>
 </div>

Modified: trunk/themes/smaller/templates/actionbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/actionbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/smaller/templates/actionbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -26,12 +26,12 @@
      <?php } ?>
      <?php echo $SEP?>
     <?php } ?>
-   <?php echo Button(array('action'=>'PageInfo'),_("Info"), $page->getName()) ?>
+   <?php echo Button(array('action'=>__('PageInfo')), _("Info"), $page->getName()) ?>
 <?php if (((defined('DEBUG') and DEBUG and $request->getArg('action') == 'browse')) || $user->isAdmin()) { ?>
       <?php // Buttons really only for debugging ?>
-      <?php echo $SEP?><?php echo Button(_("PageHistory")) ?>
+      <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
       <?php echo $SEP?><?php echo Button("diff") ?>
-      <?php echo $SEP?><?php echo Button(_("PageDump")) ?>
+      <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
     <?php // End debugging buttons ?>
     <?php } ?>
 <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>

Modified: trunk/themes/smaller/templates/info.tmpl
===================================================================
--- trunk/themes/smaller/templates/info.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/smaller/templates/info.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -2,15 +2,15 @@
 
 <div id="actionbuttons">
     <?php echo Button("viewsource", _("View Source")) ?>
-    <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
-    <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
+    <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?>
     <?php echo $SEP?><?php echo Button("Diff") ?>
     <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
     <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
-    <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
+    <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
   <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
     <?php // Buttons really only for debugging ?>
-    <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?>
+    <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?>
 <?php
     $PurgeCache = Button(array('nocache' => 'purge'),
                      _("PurgeHtmlCache"), $page->getName());

Modified: trunk/themes/smaller/templates/navbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/navbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/smaller/templates/navbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -3,8 +3,8 @@
 <form action="<?php echo WikiURL(_("TitleSearch"))?>"
       method="get" accept-charset="UTF-8">
   <div id="navbuttons">
-   <?php echo WikiLink(_("RecentChanges"), "","News") ?>
-   <?php echo $SEP?><?php echo WikiLink(_("FindPage"), "","Search:") ?>
+   <?php echo WikiLink(__("RecentChanges"), "", _("News")) ?>
+   <?php echo $SEP?><?php echo WikiLink(__("FindPage"), "", _("Search")._(":")) ?>
    <input type="hidden" name="auto_redirect" value="1" />
       <input type="text"  name="s" size="12" maxlength="256"
              title='<?php echo _("Quick Search")?>'
@@ -11,14 +11,14 @@
              onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
              onmouseout="window.status=''; return true;" />
     <?php if (!empty($revision)) { ?>
-     <?php echo $SEP?><?php echo Button(array('action'=>_("LikePages")),_("LikePages"),$page->getName()) ?>
-     <?php echo $SEP?><?php echo Button(array('action'=>_("BackLinks")), _("BackLinks"),$page->getName()) ?>
+     <?php echo $SEP?><?php echo Button(array('action'=>__("LikePages")), _("LikePages"), $page->getName()) ?>
+     <?php echo $SEP?><?php echo Button(array('action'=>__("BackLinks")), _("BackLinks"), $page->getName()) ?>
     <?php } ?>
     <?php if (!empty($user) && $user->isAdmin()) { ?>
-     <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "","Admin") ?>
+     <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Admin")) ?>
     <?php } ?>
     <?php if (!empty($user) && $user->isSignedIn()) { ?>
-     <?php echo $SEP?><?php echo WikiLink(_("UserPreferences"), "","Preferences") ?>
+     <?php echo $SEP?><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?>
     <?php } ?>
   </div>
 </form>

Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl	2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/wikilens/templates/navbar.tmpl	2021-01-05 09:56:40 UTC (rev 10226)
@@ -10,17 +10,17 @@
     <?php echo $NSEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()),
                'button', _("Discussion")) ?>
   <?php } else { ?>
-    <?php echo $NSEP?><?php echo Button(array(),_("Article"),$page->getName()) ?>
+    <?php echo $NSEP?><?php echo Button(array(), _("Article"), $page->getName()) ?>
   <?php } ?>
   <?php echo $NSEP?>
 <?php } ?>
-<?php echo WikiLink(_("RecentChanges"), "button") ?>
+<?php echo WikiLink(__("RecentChanges"), "button") ?>
 <?php echo $NSEP?><?php echo Template('search',
            array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
 ?><?php if (!empty($revision)) { ?>
-<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages"))
-?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))
-?><?php echo $NSEP?><?php echo WikiLink(_("UserPreferences"), 'button',_("Preferences")) ?><?php
+<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision, _("LikePages"), __("LikePages"))
+?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision, _("BackLinks"), __("BackLinks"))
+?><?php echo $NSEP?><?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?><?php
     /* Today's calendar page for the user, if the Calender subpage is defined. */
     $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
     $dbi = $request->getDbh();
@@ -29,7 +29,7 @@
         //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
 ?><?php echo $NSEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
 <?php }} ?><?php if (!empty($user) && $user->isAdmin()) { ?>
-<?php echo $NSEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?>
+<?php echo $NSEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?>
 <?php } ?>
 <?php if (DEBUG & 2) {
         if (isset($links)) {

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