phpwiki-checkins Mailing List for PhpWiki (Page 9)

Revision: 11000
 http://sourceforge.net/p/phpwiki/code/11000
Author: vargenau
Date: 2022年02月15日 16:55:31 +0000 (2022年2月15日)
Log Message:
-----------
lib/plugin/IncludePage.php: getWikiPageLinks returns links in the included page (as well as the included page)
Modified Paths:
--------------
 trunk/lib/plugin/IncludePage.php
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2022年02月15日 15:32:18 UTC (rev 10999)
+++ trunk/lib/plugin/IncludePage.php	2022年02月15日 16:55:31 UTC (rev 11000)
@@ -54,18 +54,28 @@
 
 function getWikiPageLinks($argstr, $basepage)
 {
- extract($this->getArgs($argstr));
+ $args = $this->getArgs($argstr);
+ $page = isset($args['page']) ? $args['page'] : '';
 
- if (!isset($page))
- return false;
- if ($page) {
- // Expand relative page names.
- $page = new WikiPageName($page, $basepage);
+ if (!$page) {
+ return array();
 }
- if (!$page or !$page->name)
- return false;
 
- return array(array('linkto' => $page->name));
+ global $request;
+ $dbi = $request->_dbi;
+ $page_handle = $dbi->getPage($page);
+ $links = $page_handle->getPageLinks();
+ $alllinks = array();
+ while ($link_handle = $links->next()) {
+ $linkname = $link_handle->getName();
+ $alllinks[] = array('linkto' => $linkname);
+ }
+ $page = new WikiPageName($page, $basepage);
+ if (!$page or !$page->name) {
+ return array();
+ }
+ $alllinks[] = array('linkto' => $page->name);
+ return $alllinks;
 }
 
 // Avoid warning in:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10999
 http://sourceforge.net/p/phpwiki/code/10999
Author: vargenau
Date: 2022年02月15日 15:32:18 +0000 (2022年2月15日)
Log Message:
-----------
lib/plugin/Template.php: getWikiPageLinks returns links in the included page (as well as the included page)
Modified Paths:
--------------
 trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2022年02月15日 15:16:11 UTC (rev 10998)
+++ trunk/lib/plugin/Template.php	2022年02月15日 15:32:18 UTC (rev 10999)
@@ -90,13 +90,22 @@
 $args = $this->getArgs($argstr);
 $page = isset($args['page']) ? $args['page'] : '';
 if ($page) {
- // Expand relative page names.
+ global $request;
+ $dbi = $request->_dbi;
+ $page_handle = $dbi->getPage($page);
+ $links = $page_handle->getPageLinks();
+ $alllinks = array();
+ while ($link_handle = $links->next()) {
+ $linkname = $link_handle->getName();
+ $alllinks[] = array('linkto' => $linkname);
+ }
 $page = new WikiPageName($page, $basepage);
 }
- if (!$page or !$page->name)
- return false;
-
- return array(array('linkto' => $page->name));
+ if (!$page or !$page->name) {
+ return array();
+ }
+ $alllinks[] = array('linkto' => $page->name);
+ return $alllinks;
 }
 
 /**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10998
 http://sourceforge.net/p/phpwiki/code/10998
Author: vargenau
Date: 2022年02月15日 15:16:11 +0000 (2022年2月15日)
Log Message:
-----------
function getWikiPageLinks returns empty array instead of false
Modified Paths:
--------------
 trunk/lib/CachedMarkup.php
 trunk/lib/WikiPlugin.php
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2022年02月15日 15:10:30 UTC (rev 10997)
+++ trunk/lib/CachedMarkup.php	2022年02月15日 15:16:11 UTC (rev 10998)
@@ -253,7 +253,7 @@
 
 function getWikiPageLinks($basepage)
 {
- return false;
+ return array();
 }
 }
 
@@ -372,14 +372,17 @@
 
 function getWikiPageLinks($basepage)
 {
- if ($basepage == '')
- return false;
- if (isset($this->_nolink))
- return false;
- if ($link = $this->getPagename($basepage))
+ if ($basepage == '') {
+ return array();
+ }
+ if (isset($this->_nolink)) {
+ return array();
+ }
+ if ($link = $this->getPagename($basepage)) {
 return array(array('linkto' => $link));
- else
- return false;
+ } else {
+ return array();
+ }
 }
 
 function _getName($basepage)
@@ -554,7 +557,9 @@
 */
 global $request;
 
- if ($basepage == '') return false;
+ if ($basepage == '') {
+ return array();
+ }
 if (!isset($this->_page) and isset($this->_attribute)) {
 // An attribute: we store it in the basepage now, to fill the cache for page->save
 // TODO: side-effect free query
@@ -563,10 +568,11 @@
 $this->_page = $basepage;
 return array(array('linkto' => '', 'relation' => $this->_relation));
 }
- if ($link = $this->getPagename($basepage))
+ if ($link = $this->getPagename($basepage)) {
 return array(array('linkto' => $link, 'relation' => $this->_relation));
- else
- return false;
+ } else {
+ return array();
+ }
 }
 
 function _expandurl($url)
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2022年02月15日 15:10:30 UTC (rev 10997)
+++ trunk/lib/WikiPlugin.php	2022年02月15日 15:16:11 UTC (rev 10998)
@@ -84,11 +84,11 @@
 *
 * @param string $argstr The plugin argument string.
 * @param string $basepage The pagename the plugin is invoked from.
- * @return array|false List of pagenames linked to (or false).
+ * @return array List of pagenames linked to.
 */
 function getWikiPageLinks($argstr, $basepage)
 {
- return false;
+ return array();
 }
 
 /**
@@ -529,13 +529,16 @@
 
 function getWikiPageLinks($pi, $basepage)
 {
- if (!($ppi = $this->parsePI($pi)))
- return false;
+ if (!($ppi = $this->parsePI($pi))) {
+ return array();
+ }
 list($pi_name, $plugin, $plugin_args) = $ppi;
- if (!is_object($plugin))
- return false;
- if ($pi_name != 'plugin')
- return false;
+ if (!is_object($plugin)) {
+ return array();
+ }
+ if ($pi_name != 'plugin') {
+ return array();
+ }
 return $plugin->getWikiPageLinks($plugin_args, $basepage);
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10997
 http://sourceforge.net/p/phpwiki/code/10997
Author: vargenau
Date: 2022年02月15日 15:10:30 +0000 (2022年2月15日)
Log Message:
-----------
lib/plugin/Template.php: get code closer to lib/plugin/IncludePage.php
Modified Paths:
--------------
 trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2022年02月15日 15:07:16 UTC (rev 10996)
+++ trunk/lib/plugin/Template.php	2022年02月15日 15:10:30 UTC (rev 10997)
@@ -112,6 +112,7 @@
 $args = $this->getArgs($argstr, $request);
 $vars = $args['vars'] ? $args['vars'] : $this->vars;
 $page = $args['page'];
+ $rev = $args['rev'];
 
 if ($page) {
 // Expand relative page names.
@@ -153,14 +154,14 @@
 }
 
 $p = $dbi->getPage($page);
- if ($args['rev']) {
- if (!is_whole_number($args['rev']) or !($args['rev'] > 0)) {
+ if ($rev) {
+ if (!is_whole_number($rev) or !($rev > 0)) {
 return $this->error(_("Error: rev must be a positive integer."));
 }
- $r = $p->getRevision($args['rev']);
+ $r = $p->getRevision($rev);
 if ((!$r) || ($r->hasDefaultContents())) {
 return $this->error(sprintf(_("%s: no such revision %d."),
- $page, $args['rev']));
+ $page, $rev));
 }
 } else {
 $r = $p->getCurrentRevision();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10996
 http://sourceforge.net/p/phpwiki/code/10996
Author: vargenau
Date: 2022年02月15日 15:07:16 +0000 (2022年2月15日)
Log Message:
-----------
lib/plugin/IncludePage.php: get code closer to lib/plugin/Template.php
Modified Paths:
--------------
 trunk/lib/plugin/IncludePage.php
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2022年02月15日 14:45:19 UTC (rev 10995)
+++ trunk/lib/plugin/IncludePage.php	2022年02月15日 15:07:16 UTC (rev 10996)
@@ -39,7 +39,8 @@
 
 function getDefaultArguments()
 {
- return array('page' => false, // the page to include
+ return array(
+ 'page' => false, // the page to include
 'rev' => false, // the revision (defaults to most recent)
 'quiet' => false, // if set, inclusion appears as normal content
 'bytes' => false, // maximum number of bytes to include
@@ -46,7 +47,7 @@
 'words' => false, // maximum number of words to include
 'lines' => false, // maximum number of lines to include
 'sections' => false, // maximum number of sections to include
- 'section' => false, // include a named section
+ 'section' => false, // just include a named section
 'sectionhead' => false // when including a named section show the heading
 );
 }
@@ -150,13 +151,12 @@
 } else {
 $r = $p->getCurrentRevision();
 }
- $c = $r->getContent();
-
+ $content = $r->getContent();
 // follow redirects
- if ((preg_match('/<' . '\?plugin\s+RedirectTo\s+page=(\S+)\s*\?' . '>/', implode("\n", $c), $m))
- or (preg_match('/<' . '\?plugin\s+RedirectTo\s+page=(.*?)\s*\?' . '>/', implode("\n", $c), $m))
- or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/', implode("\n", $c), $m))
- or (preg_match('/<<\s*RedirectTo\s+page="(.*?)"\s*>>/', implode("\n", $c), $m))
+ if ((preg_match('/<' . '\?plugin\s+RedirectTo\s+page=(\S+)\s*\?' . '>/', implode("\n", $content), $m))
+ or (preg_match('/<' . '\?plugin\s+RedirectTo\s+page=(.*?)\s*\?' . '>/', implode("\n", $content), $m))
+ or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/', implode("\n", $content), $m))
+ or (preg_match('/<<\s*RedirectTo\s+page="(.*?)"\s*>>/', implode("\n", $content), $m))
 ) {
 // Strip quotes (simple or double) from page name if any
 if ((string_starts_with($m[1], "'"))
@@ -172,10 +172,10 @@
 $page = $m[1];
 $p = $dbi->getPage($page);
 $r = $p->getCurrentRevision();
- $c = $r->getContent(); // array of lines
+ $content = $r->getContent(); // array of lines
 }
 
- $ct = $this->extractParts($c, $page, $args);
+ $ct = $this->extractParts($content, $page, $args);
 
 // exclude from expansion
 if (preg_match('/<noinclude>.+<\/noinclude>/s', $ct)) {
@@ -187,8 +187,9 @@
 include_once 'lib/BlockParser.php';
 $content = TransformText($ct, $page);
 
- if ($quiet)
+ if ($quiet) {
 return $content;
+ }
 
 if ($rev) {
 $transclusion_title = fmt("Included from %s (revision %d)", WikiLink($page), $rev);
@@ -200,7 +201,7 @@
 }
 
 /**
- * handles the arguments: section, sectionhead, lines, words, bytes,
+ * Handles the arguments: section, sectionhead, lines, words, bytes,
 * for UnfoldSubpages, IncludePage, ...
 */
 protected function extractParts($c, $pagename, $args)
@@ -209,7 +210,7 @@
 
 if ($section) {
 if ($sections) {
- $c = extractSection($section, $c, $pagename, $quiet, 1);
+ $c = extractSection($section, $c, $pagename, $quiet, true);
 } else {
 $c = extractSection($section, $c, $pagename, $quiet, $sectionhead);
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10995
 http://sourceforge.net/p/phpwiki/code/10995
Author: vargenau
Date: 2022年02月15日 14:45:19 +0000 (2022年2月15日)
Log Message:
-----------
Help%2FWikiAdminPurgePlugin and Help%2FWikiAdminRemovePlugin: See Also
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWikiAdminPurgePlugin
 trunk/pgsrc/Help%2FWikiAdminRemovePlugin
Modified: trunk/pgsrc/Help%2FWikiAdminPurgePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminPurgePlugin	2022年02月15日 14:33:50 UTC (rev 10994)
+++ trunk/pgsrc/Help%2FWikiAdminPurgePlugin	2022年02月15日 14:45:19 UTC (rev 10995)
@@ -1,4 +1,4 @@
-Date: Thu, 9 Dec 2021 18:48:34 +0000
+Date: 2022年2月15日 15:43:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWikiAdminPurgePlugin;
@@ -39,6 +39,7 @@
 
 == See Also ==
 * [[PhpWikiAdministration]]
+* [[Help:WikiAdminRemovePlugin]]
 
 <noinclude>
 ----
Modified: trunk/pgsrc/Help%2FWikiAdminRemovePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminRemovePlugin	2022年02月15日 14:33:50 UTC (rev 10994)
+++ trunk/pgsrc/Help%2FWikiAdminRemovePlugin	2022年02月15日 14:45:19 UTC (rev 10995)
@@ -1,4 +1,4 @@
-Date: Thu, 9 Dec 2021 18:48:34 +0000
+Date: 2022年2月15日 15:43:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWikiAdminRemovePlugin;
@@ -39,6 +39,7 @@
 
 == See Also ==
 * [[PhpWikiAdministration]]
+* [[Help:WikiAdminPurgePlugin]]
 
 <noinclude>
 ----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10994
 http://sourceforge.net/p/phpwiki/code/10994
Author: vargenau
Date: 2022年02月15日 14:33:50 +0000 (2022年2月15日)
Log Message:
-----------
pgsrc/Help%2FIncludePagePlugin: add full stop
Modified Paths:
--------------
 trunk/pgsrc/Help%2FIncludePagePlugin
Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2022年02月15日 14:32:37 UTC (rev 10993)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2022年02月15日 14:33:50 UTC (rev 10994)
@@ -1,4 +1,4 @@
-Date: Thu, 9 Dec 2021 18:48:34 +0000
+Date: 2022年2月15日 15:30:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FIncludePagePlugin;
@@ -24,11 +24,11 @@
 ! Default value
 |-
 | **page**
-| The page to include
+| The page to include.
 | //none// (required argument)
 |-
 | **rev**
-| The revision
+| Page revision.
 | most recent revision
 |-
 | **quiet**
@@ -36,27 +36,27 @@
 | false
 |-
 | **bytes**
-| Maximum number of bytes to include
+| Maximum number of bytes to include.
 | //none// (include whole page)
 |-
 | **words**
-| Maximum number of words to include
+| Maximum number of words to include.
 | //none// (include whole page)
 |-
 | **lines**
-| Maximum number of lines to include
+| Maximum number of lines to include.
 | //none// (include whole page)
 |-
 | **sections**
-| Maximum number of sections to include
+| Maximum number of sections to include.
 | //none// (include all sections)
 |-
 | **section**
-| Include a named section
+| Include a named section.
 | //none//
 |-
 | **sectionhead**
-| Boolean. If true, when including a named section show the heading
+| Boolean. If true, when including a named section show the heading.
 | false
 |}
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10993
 http://sourceforge.net/p/phpwiki/code/10993
Author: vargenau
Date: 2022年02月15日 14:32:37 +0000 (2022年2月15日)
Log Message:
-----------
pgsrc/Help%2FTemplatePlugin: sectionhead is a boolean
Modified Paths:
--------------
 trunk/pgsrc/Help%2FTemplatePlugin
Modified: trunk/pgsrc/Help%2FTemplatePlugin
===================================================================
--- trunk/pgsrc/Help%2FTemplatePlugin	2022年02月14日 17:54:35 UTC (rev 10992)
+++ trunk/pgsrc/Help%2FTemplatePlugin	2022年02月15日 14:32:37 UTC (rev 10993)
@@ -1,4 +1,4 @@
-Date: Thu, 9 Dec 2021 18:48:34 +0000
+Date: 2022年2月15日 15:30:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FTemplatePlugin;
@@ -60,24 +60,24 @@
 ! Default value
 |-
 | **page**
-| pagename to be included as template
+| The page to include as template.
 | //none// (required argument)
 |-
 | **vars**
-| optional parameters to be expanded inside the template
+| Optional parameters to be expanded inside the template.
 | //empty//
 |-
 | **rev**
-| page revision
+| Page revision.
 | most recent revision
 |-
 | **section**
-| just include a named section
+| Just include a named section.
 | //empty//
 |-
 | **sectionhead**
-| when including a named section show the heading
-| //empty//
+| Boolean. If true, when including a named section show the heading.
+| false
 |}
 
 === Page to include ===
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10992
 http://sourceforge.net/p/phpwiki/code/10992
Author: vargenau
Date: 2022年02月14日 17:54:35 +0000 (2022年2月14日)
Log Message:
-----------
Wordpress theme: add UserPreferences link in action bar
Modified Paths:
--------------
 trunk/themes/Wordpress/templates/actionbar.tmpl
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl	2022年02月14日 17:51:06 UTC (rev 10991)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl	2022年02月14日 17:54:35 UTC (rev 10992)
@@ -98,7 +98,7 @@
 <ul>
 <?php echo Template('signin') ?>
 <li>
- <?php echo Button(__("UserPreferences"), _("Preferences")) ?>
+ <?php echo WikiLink(__("UserPreferences"), "button", _("Preferences")) ?>
 </li>
 </ul>
 </li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10991
 http://sourceforge.net/p/phpwiki/code/10991
Author: vargenau
Date: 2022年02月14日 17:51:06 +0000 (2022年2月14日)
Log Message:
-----------
Wordpress theme: add UserPreferences link in action bar
Modified Paths:
--------------
 trunk/themes/Wordpress/templates/actionbar.tmpl
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl	2022年02月14日 17:45:23 UTC (rev 10990)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl	2022年02月14日 17:51:06 UTC (rev 10991)
@@ -97,6 +97,9 @@
 <li><?php echo _("User info") ?>
 <ul>
 <?php echo Template('signin') ?>
+ <li>
+ <?php echo Button(__("UserPreferences"), _("Preferences")) ?>
+ </li>
 </ul>
 </li>
 </ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10990
 http://sourceforge.net/p/phpwiki/code/10990
Author: vargenau
Date: 2022年02月14日 17:45:23 +0000 (2022年2月14日)
Log Message:
-----------
Wordpress theme: translate action bar titles
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
 trunk/themes/Wordpress/templates/actionbar.tmpl
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	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/de.po	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+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."
@@ -5791,6 +5791,15 @@
 msgid "Sidebar"
 msgstr "Sidebar"
 
+msgid "Editing"
+msgstr "Bearbeiten"
+
+msgid "Information"
+msgstr ""
+
+msgid "User info"
+msgstr "Benutzer Info"
+
 #~ msgid "Auth Level"
 #~ msgstr "Auth. Ebene"
 
@@ -5892,9 +5901,6 @@
 #~ msgid "CONVERTING"
 #~ msgstr "KONVERTIERE"
 
-#~ msgid "Page info"
-#~ msgstr "Seiten Info"
-
 #~ msgid "Default preferences will be used."
 #~ msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/es.po	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5663,6 +5663,15 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "Editing"
+msgstr "Editar"
+
+msgid "Information"
+msgstr ""
+
+msgid "User info"
+msgstr ""
+
 #~ msgid "EditText"
 #~ msgstr "Editar"
 
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/fr.po	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+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."
@@ -5781,6 +5781,15 @@
 msgid "Sidebar"
 msgstr "Barre latérale"
 
+msgid "Editing"
+msgstr "Modifier"
+
+msgid "Information"
+msgstr "Information"
+
+msgid "User info"
+msgstr "Infos utilisateur"
+
 #~ msgid "You can edit this page. Please use the preview button before saving."
 #~ msgstr ""
 #~ "Vous pouvez modifier cette page. Merci d'utiliser le bouton de "
@@ -5905,9 +5914,6 @@
 #~ msgstr ""
 #~ "Les sous-pages ne peuvent être créées quand la page mère n'existe pas."
 
-#~ msgid "Page info"
-#~ msgstr "Infos sur la page"
-
 #~ msgid "Page dump"
 #~ msgstr "Cliché de la page"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/it.po	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+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"
@@ -5623,6 +5623,15 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "Editing"
+msgstr "Modifica"
+
+msgid "Information"
+msgstr ""
+
+msgid "User info"
+msgstr ""
+
 #~ msgid "EditText"
 #~ msgstr "ModificaIlTesto"
 
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/ja.po	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+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"
@@ -5609,6 +5609,15 @@
 msgid "Sidebar"
 msgstr "スライドバー"
 
+msgid "Editing"
+msgstr "編集"
+
+msgid "Information"
+msgstr ""
+
+msgid "User info"
+msgstr ""
+
 #~ msgid "Auth Level"
 #~ msgstr "認証レベル"
 
@@ -5639,9 +5648,6 @@
 #~ msgid "version <em>%s</em>"
 #~ msgstr "バージョン <em>%s</em>"
 
-#~ msgid "Page info"
-#~ msgstr "ページ情報"
-
 #~ msgid "See: %s"
 #~ msgstr "参照: %s"
 
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/nl.po	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+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"
@@ -5615,6 +5615,15 @@
 msgid "Sidebar"
 msgstr "Zoek"
 
+msgid "Editing"
+msgstr "Verander"
+
+msgid "Information"
+msgstr ""
+
+msgid "User info"
+msgstr ""
+
 #~ msgid "EditText"
 #~ msgstr "VeranderTekst"
 
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/phpwiki.pot	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+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"
@@ -5608,3 +5608,12 @@
 
 msgid "Sidebar"
 msgstr ""
+
+msgid "Editing"
+msgstr ""
+
+msgid "Information"
+msgstr ""
+
+msgid "User info"
+msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/sv.po	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5610,6 +5610,15 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "Editing"
+msgstr "Redigera"
+
+msgid "Information"
+msgstr ""
+
+msgid "User info"
+msgstr ""
+
 #~ msgid "EditText"
 #~ msgstr "RedigeraText"
 
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/locale/po/zh.po	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:42+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5637,6 +5637,15 @@
 msgid "Sidebar"
 msgstr ""
 
+msgid "Editing"
+msgstr "編輯"
+
+msgid "Information"
+msgstr ""
+
+msgid "User info"
+msgstr ""
+
 #~ msgid "Auth Level"
 #~ msgstr "認證層級"
 
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl	2022年02月14日 17:25:34 UTC (rev 10989)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl	2022年02月14日 17:45:23 UTC (rev 10990)
@@ -43,7 +43,7 @@
 <?php } ?>
 </ul>
 </li>
- <li>Editing
+ <li><?php echo _("Editing") ?>
 <ul>
 <li><?php echo $EditB ?></li>
 <?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
@@ -59,7 +59,7 @@
 <?php } ?>
 </ul>
 </li>
- <li>Information
+ <li><?php echo _("Information") ?>
 <ul>
 <li>
 <a href="<?php echo WikiURL($revision,array('action'=>'diff')) ?>">
@@ -79,7 +79,7 @@
 <?php } ?>
 </ul>
 </li>
- <li>Search
+ <li><?php echo _("Search") ?>
 <ul>
 <li>
 <?plugin-form TitleSearch formsize=20 ?>
@@ -94,7 +94,7 @@
 </li>
 </ul>
 </li>
- <li>User info
+ <li><?php echo _("User info") ?>
 <ul>
 <?php echo Template('signin') ?>
 </ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10989
 http://sourceforge.net/p/phpwiki/code/10989
Author: vargenau
Date: 2022年02月14日 17:25:34 +0000 (2022年2月14日)
Log Message:
-----------
WantedPages plugin: "(1 Links)" --> "(1 Link)"
Modified Paths:
--------------
 trunk/lib/plugin/WantedPages.php
 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/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/lib/plugin/WantedPages.php	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -210,7 +210,11 @@
 {
 $pagename = $page_handle->getName();
 $count = count($this->parentobj->_wpagelist[$pagename]);
- return LinkURL(WikiURL($pagename, array('action' => 'BackLinks')),
- fmt("(%d Links)", $count));
+ if ($count == 1) {
+ return LinkURL(WikiURL($pagename, array('action' => 'BackLinks')), _("(1 Link)"));
+ } else {
+ return LinkURL(WikiURL($pagename, array('action' => 'BackLinks')),
+ fmt("(%d Links)", $count));
+ }
 }
 }
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	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/de.po	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 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."
@@ -503,9 +503,6 @@
 msgid "MyRecentChanges"
 msgstr "MeineNeuesteÄnderungen"
 
-msgid "PgsrcTranslation"
-msgstr "PgsrcÜbersetzung"
-
 msgid "RecentChangesMyPages"
 msgstr ""
 
@@ -3376,9 +3373,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden."
 
-msgid "WantedPages"
-msgstr "WunschZettelSeiten"
-
 msgid "Wanted From"
 msgstr "Benötigt von"
 
@@ -3389,6 +3383,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr "WunschZettelSeiten in diesem Wiki:"
 
+msgid "(1 Link)"
+msgstr "(1 Verweis)"
+
 msgid "Manage notifications e-mails per page."
 msgstr ""
 
@@ -4357,6 +4354,9 @@
 msgid "WabiSabi"
 msgstr ""
 
+msgid "WantedPages"
+msgstr "WunschZettelSeiten"
+
 msgid "WatchPage"
 msgstr "SeiteBeobarten"
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/es.po	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -498,9 +498,6 @@
 msgid "MyRecentChanges"
 msgstr "Mis Cambios Recientes"
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "RecentChangesMyPages"
 msgstr ""
 
@@ -1714,7 +1711,7 @@
 
 #, php-format
 msgid "(%d Links)"
-msgstr ""
+msgstr "(%d acoplamientos)"
 
 #, php-format
 msgid "Search for page titles similar to %s."
@@ -1897,7 +1894,7 @@
 msgstr ""
 
 msgid "Links"
-msgstr ""
+msgstr "Acoplamientos"
 
 #, php-format
 msgid "Unsupported format argument %s"
@@ -3297,9 +3294,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "WantedPages"
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -3310,6 +3304,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr ""
 
+msgid "(1 Link)"
+msgstr "(1 acoplamiento)"
+
 msgid "Manage notifications e-mails per page."
 msgstr ""
 
@@ -4260,6 +4257,9 @@
 msgid "WabiSabi"
 msgstr ""
 
+msgid "WantedPages"
+msgstr ""
+
 msgid "WatchPage"
 msgstr ""
 
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/fr.po	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 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."
@@ -506,9 +506,6 @@
 msgid "MyRecentChanges"
 msgstr "MesChangementsRécents"
 
-msgid "PgsrcTranslation"
-msgstr "TraductionPgsrc"
-
 msgid "RecentChangesMyPages"
 msgstr "DernièresModifsDeMesPages"
 
@@ -3365,9 +3362,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr "Afficher toutes les pages référencées qui n'existent pas."
 
-msgid "WantedPages"
-msgstr "PagesRecherchées"
-
 msgid "Wanted From"
 msgstr "Recherchées par"
 
@@ -3378,6 +3372,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr "Pages recherchées dans ce wiki :"
 
+msgid "(1 Link)"
+msgstr "(1 lien)"
+
 msgid "Manage notifications e-mails per page."
 msgstr "Gérér les notifications par courriel des pages."
 
@@ -4347,6 +4344,9 @@
 msgid "WabiSabi"
 msgstr "WabiSabi"
 
+msgid "WantedPages"
+msgstr "PagesRecherchées"
+
 msgid "WatchPage"
 msgstr "Suivre"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/it.po	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 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"
@@ -488,9 +488,6 @@
 msgid "MyRecentChanges"
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "RecentChangesMyPages"
 msgstr ""
 
@@ -1697,7 +1694,7 @@
 
 #, php-format
 msgid "(%d Links)"
-msgstr ""
+msgstr "(%d collegamenti)"
 
 #, php-format
 msgid "Search for page titles similar to %s."
@@ -1880,7 +1877,7 @@
 msgstr ""
 
 msgid "Links"
-msgstr ""
+msgstr "Collegamenti"
 
 #, php-format
 msgid "Unsupported format argument %s"
@@ -1908,7 +1905,7 @@
 msgstr ""
 
 msgid "Link"
-msgstr ""
+msgstr "Collegamento"
 
 #, php-format
 msgid "LinkSearch result for "%s" in pages "%s", direction %s"
@@ -3274,9 +3271,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "WantedPages"
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -3287,6 +3281,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr ""
 
+msgid "(1 Link)"
+msgstr "(1 collegamento)"
+
 msgid "Manage notifications e-mails per page."
 msgstr ""
 
@@ -4237,6 +4234,9 @@
 msgid "WabiSabi"
 msgstr ""
 
+msgid "WantedPages"
+msgstr ""
+
 msgid "WatchPage"
 msgstr ""
 
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/ja.po	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 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"
@@ -476,9 +476,6 @@
 msgid "MyRecentChanges"
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "RecentChangesMyPages"
 msgstr ""
 
@@ -3260,9 +3257,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "WantedPages"
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -3273,6 +3267,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr ""
 
+msgid "(1 Link)"
+msgstr ""
+
 msgid "Manage notifications e-mails per page."
 msgstr ""
 
@@ -4223,6 +4220,9 @@
 msgid "WabiSabi"
 msgstr ""
 
+msgid "WantedPages"
+msgstr ""
+
 msgid "WatchPage"
 msgstr ""
 
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/nl.po	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 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"
@@ -482,9 +482,6 @@
 msgid "MyRecentChanges"
 msgstr "MijnRecenteVeranderingen"
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "RecentChangesMyPages"
 msgstr ""
 
@@ -1689,7 +1686,7 @@
 
 #, php-format
 msgid "(%d Links)"
-msgstr ""
+msgstr "(%d links)"
 
 #, php-format
 msgid "Search for page titles similar to %s."
@@ -1900,7 +1897,7 @@
 msgstr ""
 
 msgid "Link"
-msgstr ""
+msgstr "Link"
 
 #, php-format
 msgid "LinkSearch result for "%s" in pages "%s", direction %s"
@@ -3266,9 +3263,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "WantedPages"
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -3279,6 +3273,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr ""
 
+msgid "(1 Link)"
+msgstr "(1 link)"
+
 msgid "Manage notifications e-mails per page."
 msgstr ""
 
@@ -4229,6 +4226,9 @@
 msgid "WabiSabi"
 msgstr "WabiSabi"
 
+msgid "WantedPages"
+msgstr ""
+
 msgid "WatchPage"
 msgstr ""
 
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/phpwiki.pot	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 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"
@@ -476,9 +476,6 @@
 msgid "MyRecentChanges"
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "RecentChangesMyPages"
 msgstr ""
 
@@ -3260,9 +3257,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "WantedPages"
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -3273,6 +3267,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr ""
 
+msgid "(1 Link)"
+msgstr ""
+
 msgid "Manage notifications e-mails per page."
 msgstr ""
 
@@ -4223,6 +4220,9 @@
 msgid "WabiSabi"
 msgstr ""
 
+msgid "WantedPages"
+msgstr ""
+
 msgid "WatchPage"
 msgstr ""
 
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/sv.po	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 18:24+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -477,9 +477,6 @@
 msgid "MyRecentChanges"
 msgstr "MinaSenasteÄndringar"
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "RecentChangesMyPages"
 msgstr ""
 
@@ -3261,9 +3258,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "WantedPages"
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -3274,6 +3268,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr ""
 
+msgid "(1 Link)"
+msgstr ""
+
 msgid "Manage notifications e-mails per page."
 msgstr ""
 
@@ -4224,6 +4221,9 @@
 msgid "WabiSabi"
 msgstr ""
 
+msgid "WantedPages"
+msgstr ""
+
 msgid "WatchPage"
 msgstr ""
 
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022年02月07日 15:26:52 UTC (rev 10988)
+++ trunk/locale/po/zh.po	2022年02月14日 17:25:34 UTC (rev 10989)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022年01月27日 14:57+0100\n"
+"POT-Creation-Date: 2022年02月14日 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"
@@ -479,9 +479,6 @@
 msgid "MyRecentChanges"
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "RecentChangesMyPages"
 msgstr ""
 
@@ -1690,7 +1687,7 @@
 
 #, php-format
 msgid "(%d Links)"
-msgstr ""
+msgstr "(%d 連結)"
 
 #, php-format
 msgid "Search for page titles similar to %s."
@@ -3271,9 +3268,6 @@
 msgid "List referenced page names which do not exist yet."
 msgstr "列出還未存在的頁面名稱."
 
-msgid "WantedPages"
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -3284,6 +3278,9 @@
 msgid "Wanted Pages in this wiki:"
 msgstr "在此 wiki 所需要的頁面:"
 
+msgid "(1 Link)"
+msgstr "(1 連結)"
+
 msgid "Manage notifications e-mails per page."
 msgstr ""
 
@@ -4234,6 +4231,9 @@
 msgid "WabiSabi"
 msgstr ""
 
+msgid "WantedPages"
+msgstr ""
+
 msgid "WatchPage"
 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.

Revision: 10988
 http://sourceforge.net/p/phpwiki/code/10988
Author: vargenau
Date: 2022年02月07日 15:26:52 +0000 (2022年2月07日)
Log Message:
-----------
pgsrc/ReleaseNotes: Make WantedPages work for DATABASE_TYPE = dba and file
Modified Paths:
--------------
 trunk/locale/it/pgsrc/NoteDiRilascio
 trunk/pgsrc/ReleaseNotes
Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022年02月07日 15:15:35 UTC (rev 10987)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022年02月07日 15:26:52 UTC (rev 10988)
@@ -1,4 +1,4 @@
-Date: 2022年1月27日 19:37:10 +0000
+Date: Mon, 7 Feb 2022 16:26:30 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=NoteDiRilascio;
@@ -11,7 +11,8 @@
 == 1.6.2 2022-XX-XX Marc-Etienne Vargenau ==
 
 === Fixes ===
-* Make renaming of pages work in PDO and file.
+* Make renaming of pages work for DATABASE_TYPE = PDO and file.
+* Make WantedPages work for DATABASE_TYPE = dba and file
 
 == 1.6.1 2022年01月24日 Marc-Etienne Vargenau ==
 
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022年02月07日 15:15:35 UTC (rev 10987)
+++ trunk/pgsrc/ReleaseNotes	2022年02月07日 15:26:52 UTC (rev 10988)
@@ -1,4 +1,4 @@
-Date: 2022年1月27日 19:37:10 +0000
+Date: Mon, 7 Feb 2022 16:26:30 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -11,7 +11,8 @@
 == 1.6.2 2022-XX-XX Marc-Etienne Vargenau ==
 
 === Fixes ===
-* Make renaming of pages work in PDO and file.
+* Make renaming of pages work for DATABASE_TYPE = PDO and file.
+* Make WantedPages work for DATABASE_TYPE = dba and file
 
 == 1.6.1 2022年01月24日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10987
 http://sourceforge.net/p/phpwiki/code/10987
Author: vargenau
Date: 2022年02月07日 15:15:35 +0000 (2022年2月07日)
Log Message:
-----------
Add {}
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php	2022年02月07日 15:10:22 UTC (rev 10986)
+++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php	2022年02月07日 15:15:35 UTC (rev 10987)
@@ -108,7 +108,9 @@
 }
 $links->free();
 unset($links);
- if ($this->pagelinks) return array_pop($this->pagelinks);
+ if ($this->pagelinks) {
+ return array_pop($this->pagelinks);
+ }
 }
 return false;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10986
 http://sourceforge.net/p/phpwiki/code/10986
Author: vargenau
Date: 2022年02月07日 15:10:22 +0000 (2022年2月07日)
Log Message:
-----------
Make WantedPages work for DATABASE_TYPE = dba and file
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_mysqli.php
 trunk/lib/plugin/WantedPages.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022年02月07日 12:08:16 UTC (rev 10985)
+++ trunk/lib/WikiDB/backend/PDO.php	2022年02月07日 15:10:22 UTC (rev 10986)
@@ -1090,7 +1090,7 @@
 left join page on(link.linkto=page.id) left join nonempty on(link.linkto=nonempty.id)
 where isnull(nonempty.id) and linked.id=link.linkfrom;
 */
- $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
+ $sql = "SELECT p.pagename AS wantedfrom, pp.pagename AS pagename"
 . " FROM $page_tbl p JOIN $link_tbl linked"
 . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
 . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id"
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2022年02月07日 12:08:16 UTC (rev 10985)
+++ trunk/lib/WikiDB/backend/PearDB.php	2022年02月07日 15:10:22 UTC (rev 10986)
@@ -885,7 +885,7 @@
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 }
 
- $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
+ $sql = "SELECT p.pagename AS wantedfrom, pp.pagename AS pagename"
 . " FROM $page_tbl p, $link_tbl linked"
 . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
 . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id"
Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022年02月07日 12:08:16 UTC (rev 10985)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022年02月07日 15:10:22 UTC (rev 10986)
@@ -112,11 +112,12 @@
 if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
 $orderby = 'ORDER BY ' . $orderby;
 
- if ($exclude) // array of pagenames
+ if ($exclude) { // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
+ }
 
 /* ISNULL is mysql specific */
- $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
+ $sql = "SELECT p.pagename AS wantedfrom, pp.pagename AS pagename"
 . " FROM $page_tbl p, $link_tbl linked"
 . " LEFT JOIN $page_tbl pp ON (linked.linkto = pp.id)"
 . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)"
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2022年02月07日 12:08:16 UTC (rev 10985)
+++ trunk/lib/plugin/WantedPages.php	2022年02月07日 15:10:22 UTC (rev 10986)
@@ -122,8 +122,8 @@
 list($offset, $maxcount) = $pagelist->limit($limit);
 $wanted_iter = $dbi->wantedPages($exclude, $sortby, $limit);
 while ($row = $wanted_iter->next()) {
- $wantedfrom = $row['pagename'];
- $wanted = $row['wantedfrom'];
+ $wantedfrom = $row['wantedfrom'];
+ $wanted = $row['pagename'];
 if (!in_array($wantedfrom, $exclude_from)) {
 // ignore duplicates:
 if (empty($pagelist->_wpagelist[$wanted]))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10985
 http://sourceforge.net/p/phpwiki/code/10985
Author: vargenau
Date: 2022年02月07日 12:08:16 +0000 (2022年2月07日)
Log Message:
-----------
Same prototype for get_all_pages
Modified Paths:
--------------
 trunk/lib/WikiDB/backend.php
 trunk/lib/WikiDB.php
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2022年02月05日 17:52:43 UTC (rev 10984)
+++ trunk/lib/WikiDB/backend.php	2022年02月07日 12:08:16 UTC (rev 10985)
@@ -303,7 +303,7 @@
 * @param string $exclude
 * @return object A WikiDB_backend_iterator.
 */
- abstract function get_all_pages($include_empty,
+ abstract function get_all_pages($include_empty = false,
 $sortby = '', $limit = '', $exclude = '');
 
 /**
@@ -336,7 +336,7 @@
 // this method with something more efficient.
 include_once 'lib/WikiDB/backend/dumb/TextSearchIter.php';
 // ignore $limit
- $pages = $this->get_all_pages(false, $sortby, false, $exclude);
+ $pages = $this->get_all_pages(false, $sortby, '', $exclude);
 return new WikiDB_backend_dumb_TextSearchIter($this, $pages, $search, $fulltext,
 array('limit' => $limit,
 'exclude' => $exclude));
@@ -379,7 +379,7 @@
 // It is expected that most backends will overload
 // method with something more efficient.
 include_once 'lib/WikiDB/backend/dumb/MostPopularIter.php';
- $pages = $this->get_all_pages(false, $sortby, false);
+ $pages = $this->get_all_pages(false, $sortby);
 return new WikiDB_backend_dumb_MostPopularIter($this, $pages, $limit);
 }
 
@@ -406,7 +406,7 @@
 public function wanted_pages($exclude = '', $sortby = '', $limit = '')
 {
 include_once 'lib/WikiDB/backend/dumb/WantedPagesIter.php';
- $allpages = $this->get_all_pages(true, false, false, $exclude_from);
+ $allpages = $this->get_all_pages();
 return new WikiDB_backend_dumb_WantedPagesIter($this, $allpages, $exclude, $sortby, $limit);
 }
 
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2022年02月05日 17:52:43 UTC (rev 10984)
+++ trunk/lib/WikiDB.php	2022年02月07日 12:08:16 UTC (rev 10985)
@@ -301,8 +301,7 @@
 */
 public function getAllPages($include_empty = false, $sortby = '', $limit = '', $exclude = '')
 {
- $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit,
- $exclude);
+ $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit, $exclude);
 return new WikiDB_PageIterator($this, $result,
 array('include_empty' => $include_empty,
 'exclude' => $exclude,
@@ -444,7 +443,7 @@
 /**
 * @param string $exclude
 * @param string $sortby Optional. "+-column,+-column2".
- * If false the result is faster in natural order.
+ * If empty string the result is faster in natural order.
 * @param string $limit Optional. Encoded as "$offset,$count".
 * $offset defaults to 0.
 * @return WikiDB_backend_dumb_WantedPagesIter A generic iterator containing rows of
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10984
 http://sourceforge.net/p/phpwiki/code/10984
Author: vargenau
Date: 2022年02月05日 17:52:43 +0000 (2022年2月05日)
Log Message:
-----------
LinkDatabase plugin: argument include_empty makes no sense, empty pages have no link
Modified Paths:
--------------
 trunk/lib/plugin/LinkDatabase.php
 trunk/pgsrc/Help%2FLinkDatabasePlugin
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2022年02月05日 17:42:12 UTC (rev 10983)
+++ trunk/lib/plugin/LinkDatabase.php	2022年02月05日 17:52:43 UTC (rev 10984)
@@ -63,7 +63,6 @@
 array(
 'format' => 'html', // 'html', 'text', 'xml'
 'noheader' => false,
- 'include_empty' => false,
 'exclude_from' => false,
 ));
 }
@@ -102,17 +101,6 @@
 global $WikiTheme;
 $args = $this->getArgs($argstr, $request);
 
- $include_empty = $args['include_empty'];
- if (!is_bool($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"));
@@ -121,7 +109,7 @@
 $caption = _("All pages with all links in this wiki (%d total):");
 
 if (!empty($args['owner'])) {
- $pages = PageList::allPagesByOwner($args['owner'], $include_empty,
+ $pages = PageList::allPagesByOwner($args['owner'], false,
 $args['sortby'], $args['limit']);
 if ($args['owner'])
 $caption = fmt("List of pages owned by %s (%d total):",
@@ -128,7 +116,7 @@
 WikiLink($args['owner'], 'if_known'),
 count($pages));
 } elseif (!empty($args['author'])) {
- $pages = PageList::allPagesByAuthor($args['author'], $include_empty,
+ $pages = PageList::allPagesByAuthor($args['author'], false,
 $args['sortby'], $args['limit']);
 if ($args['author'])
 $caption = fmt("List of pages last edited by %s (%d total):",
@@ -135,7 +123,7 @@
 WikiLink($args['author'], 'if_known'),
 count($pages));
 } elseif (!empty($args['creator'])) {
- $pages = PageList::allPagesByCreator($args['creator'], $include_empty,
+ $pages = PageList::allPagesByCreator($args['creator'], false,
 $args['sortby'], $args['limit']);
 if ($args['creator'])
 $caption = fmt("List of pages created by %s (%d total):",
@@ -143,10 +131,10 @@
 count($pages));
 } else {
 if (!$request->getArg('count'))
- $args['count'] = $dbi->numPages($include_empty, $args['exclude_from']);
+ $args['count'] = $dbi->numPages(false, $args['exclude_from']);
 else
 $args['count'] = $request->getArg('count');
- $pages = $dbi->getAllPages($include_empty, $args['sortby'],
+ $pages = $dbi->getAllPages(false, $args['sortby'],
 $args['limit'], $args['exclude_from']);
 }
 if ($args['format'] == 'html') {
Modified: trunk/pgsrc/Help%2FLinkDatabasePlugin
===================================================================
--- trunk/pgsrc/Help%2FLinkDatabasePlugin	2022年02月05日 17:42:12 UTC (rev 10983)
+++ trunk/pgsrc/Help%2FLinkDatabasePlugin	2022年02月05日 17:52:43 UTC (rev 10984)
@@ -1,4 +1,4 @@
-Date: Sat, 5 Feb 2022 18:40:59 +0000
+Date: Sat, 5 Feb 2022 18:51:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FLinkDatabasePlugin;
@@ -32,10 +32,6 @@
 | Boolean. If true, header should be omitted.
 | false
 |-
-| **include_empty**
-| Boolean. If true, pages that are referenced but not yet created are included in the list.
-| false
-|-
 | **exclude_from**
 |
 | false
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10983
 http://sourceforge.net/p/phpwiki/code/10983
Author: vargenau
Date: 2022年02月05日 17:42:12 +0000 (2022年2月05日)
Log Message:
-----------
LinkDatabaseP plugin: info is already included in PageList arguments
Modified Paths:
--------------
 trunk/lib/plugin/LinkDatabase.php
 trunk/pgsrc/Help%2FLinkDatabasePlugin
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2022年02月05日 17:15:23 UTC (rev 10982)
+++ trunk/lib/plugin/LinkDatabase.php	2022年02月05日 17:42:12 UTC (rev 10983)
@@ -65,7 +65,6 @@
 'noheader' => false,
 'include_empty' => false,
 'exclude_from' => false,
- 'info' => '',
 ));
 }
 
Modified: trunk/pgsrc/Help%2FLinkDatabasePlugin
===================================================================
--- trunk/pgsrc/Help%2FLinkDatabasePlugin	2022年02月05日 17:15:23 UTC (rev 10982)
+++ trunk/pgsrc/Help%2FLinkDatabasePlugin	2022年02月05日 17:42:12 UTC (rev 10983)
@@ -1,4 +1,4 @@
-Date: 2021年2月22日 19:16:32 +0000
+Date: Sat, 5 Feb 2022 18:40:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FLinkDatabasePlugin;
@@ -39,10 +39,6 @@
 | **exclude_from**
 |
 | false
-|-
-| **info**
-|
-|
 |}
 
 == Example ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10982
 http://sourceforge.net/p/phpwiki/code/10982
Author: vargenau
Date: 2022年02月05日 17:15:23 +0000 (2022年2月05日)
Log Message:
-----------
Remove exclude_from argument from functions wanted_pages and wantedPages
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
 trunk/lib/WikiDB/backend/PearDB_mysqli.php
 trunk/lib/WikiDB/backend.php
 trunk/lib/WikiDB.php
 trunk/lib/plugin/WantedPages.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022年02月05日 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend/PDO.php	2022年02月05日 17:15:23 UTC (rev 10982)
@@ -1071,7 +1071,7 @@
 /*
 * Find referenced empty pages.
 */
- function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+ function wanted_pages($exclude = '', $sortby = '', $limit = '')
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2022年02月05日 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend/PearDB.php	2022年02月05日 17:15:23 UTC (rev 10982)
@@ -874,7 +874,7 @@
 /*
 * Find referenced empty pages.
 */
- function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+ function wanted_pages($exclude = '', $sortby = '', $limit = '')
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2022年02月05日 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2022年02月05日 17:15:23 UTC (rev 10982)
@@ -551,7 +551,7 @@
 /*
 * Find referenced empty pages.
 */
- function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+ function wanted_pages($exclude = '', $sortby = '', $limit = '')
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022年02月05日 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022年02月05日 17:15:23 UTC (rev 10982)
@@ -105,7 +105,7 @@
 /*
 * Find referenced empty pages.
 */
- function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+ function wanted_pages($exclude = '', $sortby = '', $limit = '')
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2022年02月05日 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend.php	2022年02月05日 17:15:23 UTC (rev 10982)
@@ -403,7 +403,7 @@
 return new WikiDB_backend_dumb_MostRecentIter($this, $pages, $params);
 }
 
- public function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+ public function wanted_pages($exclude = '', $sortby = '', $limit = '')
 {
 include_once 'lib/WikiDB/backend/dumb/WantedPagesIter.php';
 $allpages = $this->get_all_pages(true, false, false, $exclude_from);
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2022年02月05日 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB.php	2022年02月05日 17:15:23 UTC (rev 10982)
@@ -442,7 +442,6 @@
 }
 
 /**
- * @param string $exclude_from
 * @param string $exclude
 * @param string $sortby Optional. "+-column,+-column2".
 * If false the result is faster in natural order.
@@ -451,9 +450,9 @@
 * @return WikiDB_backend_dumb_WantedPagesIter A generic iterator containing rows of
 * (duplicate) pagename, wantedfrom.
 */
- public function wantedPages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+ public function wantedPages($exclude = '', $sortby = '', $limit = '')
 {
- return $this->_backend->wanted_pages($exclude_from, $exclude, $sortby, $limit);
+ return $this->_backend->wanted_pages($exclude, $sortby, $limit);
 }
 
 /**
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2022年02月05日 17:08:06 UTC (rev 10981)
+++ trunk/lib/plugin/WantedPages.php	2022年02月05日 17:15:23 UTC (rev 10982)
@@ -120,7 +120,7 @@
 
 if (!$page) {
 list($offset, $maxcount) = $pagelist->limit($limit);
- $wanted_iter = $dbi->wantedPages($exclude_from, $exclude, $sortby, $limit);
+ $wanted_iter = $dbi->wantedPages($exclude, $sortby, $limit);
 while ($row = $wanted_iter->next()) {
 $wantedfrom = $row['pagename'];
 $wanted = $row['wantedfrom'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10981
 http://sourceforge.net/p/phpwiki/code/10981
Author: vargenau
Date: 2022年02月05日 17:08:06 +0000 (2022年2月05日)
Log Message:
-----------
WantedPages plugin: handle exclude_from argument in lib/plugin/WantedPages.php
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
 trunk/lib/WikiDB/backend/PearDB_mysqli.php
 trunk/lib/plugin/WantedPages.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022年02月03日 20:03:12 UTC (rev 10980)
+++ trunk/lib/WikiDB/backend/PDO.php	2022年02月05日 17:08:06 UTC (rev 10981)
@@ -1078,9 +1078,6 @@
 if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
 $orderby = 'ORDER BY ' . $orderby;
 
- if ($exclude_from) { // array of pagenames
- $exclude_from = " AND linked.pagename NOT IN " . $this->_sql_set($exclude_from);
- }
 if ($exclude) { // array of pagenames
 $exclude = " AND $page_tbl.pagename NOT IN " . $this->_sql_set($exclude);
 }
@@ -1099,7 +1096,6 @@
 . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id"
 . " WHERE ne.id IS NULL"
 . " AND p.id = linked.linkfrom"
- . $exclude_from
 . $exclude
 . $orderby;
 if ($limit) {
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2022年02月03日 20:03:12 UTC (rev 10980)
+++ trunk/lib/WikiDB/backend/PearDB.php	2022年02月05日 17:08:06 UTC (rev 10981)
@@ -881,9 +881,6 @@
 if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
 $orderby = 'ORDER BY ' . $orderby;
 
- if ($exclude_from) { // array of pagenames
- $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
- }
 if ($exclude) { // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 }
@@ -894,7 +891,6 @@
 . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id"
 . " WHERE ne.id IS NULL"
 . " AND p.id = linked.linkfrom"
- . $exclude_from
 . $exclude
 . $orderby;
 if ($limit) {
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2022年02月03日 20:03:12 UTC (rev 10980)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2022年02月05日 17:08:06 UTC (rev 10981)
@@ -560,8 +560,6 @@
 if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
 $orderby = 'ORDER BY ' . $orderby;
 
- if ($exclude_from) // array of pagenames
- $exclude_from = " AND substring(p.pagename from $p) NOT IN " . $this->_sql_set($exclude_from);
 if ($exclude) // array of pagenames
 $exclude = " AND substring(p.pagename from $p) NOT IN " . $this->_sql_set($exclude);
 $sql = "SELECT substring(pp.pagename from $p) AS wantedfrom, substring(p.pagename from $p) AS pagename"
@@ -572,7 +570,6 @@
 . " AND p.id = linked.linkfrom"
 . " AND substring(p.pagename from 0 for $p) = '$page_prefix'"
 . " AND substring(pp.pagename from 0 for $p) = '$page_prefix'"
- . $exclude_from
 . $exclude
 . $orderby;
 if ($limit) {
Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022年02月03日 20:03:12 UTC (rev 10980)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022年02月05日 17:08:06 UTC (rev 10981)
@@ -112,8 +112,6 @@
 if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
 $orderby = 'ORDER BY ' . $orderby;
 
- if ($exclude_from) // array of pagenames
- $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
 if ($exclude) // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 
@@ -124,7 +122,6 @@
 . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)"
 . " WHERE ISNULL(ne.id)"
 . " AND p.id = linked.linkfrom"
- . $exclude_from
 . $exclude
 . $orderby;
 if ($limit) {
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2022年02月03日 20:03:12 UTC (rev 10980)
+++ trunk/lib/plugin/WantedPages.php	2022年02月05日 17:08:06 UTC (rev 10981)
@@ -124,13 +124,15 @@
 while ($row = $wanted_iter->next()) {
 $wantedfrom = $row['pagename'];
 $wanted = $row['wantedfrom'];
- // ignore duplicates:
- if (empty($pagelist->_wpagelist[$wanted]))
- $pagelist->addPage($wanted);
- if (!isset($pagelist->_wpagelist[$wanted]))
- $pagelist->_wpagelist[$wanted][] = $wantedfrom;
- elseif (!in_array($wantedfrom, $pagelist->_wpagelist[$wanted]))
- $pagelist->_wpagelist[$wanted][] = $wantedfrom;
+ if (!in_array($wantedfrom, $exclude_from)) {
+ // ignore duplicates:
+ if (empty($pagelist->_wpagelist[$wanted]))
+ $pagelist->addPage($wanted);
+ if (!isset($pagelist->_wpagelist[$wanted]))
+ $pagelist->_wpagelist[$wanted][] = $wantedfrom;
+ elseif (!in_array($wantedfrom, $pagelist->_wpagelist[$wanted]))
+ $pagelist->_wpagelist[$wanted][] = $wantedfrom;
+ }
 }
 $wanted_iter->free();
 unset($wanted_iter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10980
 http://sourceforge.net/p/phpwiki/code/10980
Author: vargenau
Date: 2022年02月03日 20:03:12 +0000 (2022年2月03日)
Log Message:
-----------
pgsrc/Help%2FWantedPagesPlugin: [[OrphanedPages]] --> [[Help:OrphanedPagesPlugin]]
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWantedPagesPlugin
Modified: trunk/pgsrc/Help%2FWantedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FWantedPagesPlugin	2022年02月03日 20:02:42 UTC (rev 10979)
+++ trunk/pgsrc/Help%2FWantedPagesPlugin	2022年02月03日 20:03:12 UTC (rev 10980)
@@ -1,4 +1,4 @@
-Date: Thu, 3 Feb 2022 18:48:36 +0000
+Date: Thu, 3 Feb 2022 20:43:52 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWantedPagesPlugin;
@@ -59,7 +59,7 @@
 * [[Help:Reini Urban|Reini Urban]]
 
 == See Also ==
-* [[OrphanedPages]]
+* [[Help:OrphanedPagesPlugin]]
 
 <noinclude>
 ----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10979
 http://sourceforge.net/p/phpwiki/code/10979
Author: vargenau
Date: 2022年02月03日 20:02:42 +0000 (2022年2月03日)
Log Message:
-----------
Update pgsrc/Help%2FMostPopularPlugin
Modified Paths:
--------------
 trunk/pgsrc/Help%2FMostPopularPlugin
Modified: trunk/pgsrc/Help%2FMostPopularPlugin
===================================================================
--- trunk/pgsrc/Help%2FMostPopularPlugin	2022年02月03日 20:01:55 UTC (rev 10978)
+++ trunk/pgsrc/Help%2FMostPopularPlugin	2022年02月03日 20:02:42 UTC (rev 10979)
@@ -1,4 +1,4 @@
-Date: Thu, 9 Dec 2021 18:48:34 +0000
+Date: Thu, 3 Feb 2022 20:43:52 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FMostPopularPlugin;
@@ -29,7 +29,7 @@
 | 20
 |-
 | **sortby**
-| Page sorting order
+| Select column to sort.
 | ~-hits
 |-
 | **noheader**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10978
 http://sourceforge.net/p/phpwiki/code/10978
Author: vargenau
Date: 2022年02月03日 20:01:55 +0000 (2022年2月03日)
Log Message:
-----------
sortby default is pagename
Modified Paths:
--------------
 trunk/lib/plugin/OrphanedPages.php
 trunk/pgsrc/Help%2FOrphanedPagesPlugin
Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php	2022年02月03日 17:49:09 UTC (rev 10977)
+++ trunk/lib/plugin/OrphanedPages.php	2022年02月03日 20:01:55 UTC (rev 10978)
@@ -44,16 +44,12 @@
 'include_empty' => false,
 'exclude' => '',
 'info' => '',
- 'sortby' => false,
+ 'sortby' => 'pagename',
 'limit' => 0,
 'paging' => 'auto',
 );
 }
 
- // info arg allows multiple columns
- // info=mtime,hits,summary,version,author,locked,minor,markup or all
- // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
-
 /**
 * @param WikiDB $dbi
 * @param string $argstr
Modified: trunk/pgsrc/Help%2FOrphanedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FOrphanedPagesPlugin	2022年02月03日 17:49:09 UTC (rev 10977)
+++ trunk/pgsrc/Help%2FOrphanedPagesPlugin	2022年02月03日 20:01:55 UTC (rev 10978)
@@ -1,4 +1,4 @@
-Date: Thu, 3 Feb 2022 18:48:36 +0000
+Date: Thu, 3 Feb 2022 20:43:52 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FOrphanedPagesPlugin;
@@ -30,23 +30,23 @@
 | false
 |-
 | **exclude**
-| Comma-separated list of pages to exclude
+| Comma-separated list of pages to exclude.
 | //empty//
 |-
 | **info**
-| List of columns to display
-| //empty//
+| List of columns to display.
+| //empty// (only the page name will be displayed)
 |-
 | **sortby**
-|
-| false
+| Select column to sort.
+| pagename
 |-
 | **limit**
-|
+| The number of pages to display. If the limit is 0, all orphaned pages will be displayed.
 | 0
 |-
 | **paging**
-|
+| auto (top + bottom rows if applicable) \\ top (top only if applicable) \\ bottom (bottom only if applicable) \\ none (don't page at all)
 | auto
 |}
 
@@ -62,7 +62,7 @@
 * [[Help:Reini Urban|Reini Urban]]
 
 == See Also ==
-* [[WantedPages]]
+* [[Help:WantedPagesPlugin]]
 
 <noinclude>
 ----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10977
 http://sourceforge.net/p/phpwiki/code/10977
Author: vargenau
Date: 2022年02月03日 17:49:09 +0000 (2022年2月03日)
Log Message:
-----------
See Also [[WantedPages]], [[OrphanedPages]]
Modified Paths:
--------------
 trunk/pgsrc/Help%2FOrphanedPagesPlugin
 trunk/pgsrc/Help%2FWantedPagesPlugin
Modified: trunk/pgsrc/Help%2FOrphanedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FOrphanedPagesPlugin	2022年02月03日 17:37:36 UTC (rev 10976)
+++ trunk/pgsrc/Help%2FOrphanedPagesPlugin	2022年02月03日 17:49:09 UTC (rev 10977)
@@ -1,4 +1,4 @@
-Date: Thu, 9 Dec 2021 18:48:34 +0000
+Date: Thu, 3 Feb 2022 18:48:36 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FOrphanedPagesPlugin;
@@ -62,6 +62,7 @@
 * [[Help:Reini Urban|Reini Urban]]
 
 == See Also ==
+* [[WantedPages]]
 
 <noinclude>
 ----
Modified: trunk/pgsrc/Help%2FWantedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FWantedPagesPlugin	2022年02月03日 17:37:36 UTC (rev 10976)
+++ trunk/pgsrc/Help%2FWantedPagesPlugin	2022年02月03日 17:49:09 UTC (rev 10977)
@@ -1,4 +1,4 @@
-Date: Thu, 3 Feb 2022 18:34:11 +0000
+Date: Thu, 3 Feb 2022 18:48:36 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWantedPagesPlugin;
@@ -28,7 +28,7 @@
 |-
 | **page**
 | Just for a single page.
-| //empty/
+| //empty//
 |-
 | **withlinks**
 | Boolean. If true, display links.
@@ -59,6 +59,7 @@
 * [[Help:Reini Urban|Reini Urban]]
 
 == See Also ==
+* [[OrphanedPages]]
 
 <noinclude>
 ----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10976
 http://sourceforge.net/p/phpwiki/code/10976
Author: vargenau
Date: 2022年02月03日 17:37:36 +0000 (2022年2月03日)
Log Message:
-----------
WantedPages plugin: withlinks argument is a boolean, page argument default value is empty
Modified Paths:
--------------
 trunk/lib/plugin/WantedPages.php
 trunk/pgsrc/Help%2FWantedPagesPlugin
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2022年02月03日 16:05:35 UTC (rev 10975)
+++ trunk/lib/plugin/WantedPages.php	2022年02月03日 17:37:36 UTC (rev 10976)
@@ -23,9 +23,6 @@
 */
 
 /**
- * Rewrite of WantedPages, which uses PageList and prints the references, not just the count.
- * It disables r1.6 but is more explicit, and of comparable convenience.
- *
 * A plugin which returns a list of referenced pages which do not exist yet.
 * All empty pages which are linked from any page - with an ending question mark,
 * or for just a single page, when the page argument is present.
@@ -50,17 +47,13 @@
 return array_merge
 (
 PageList::supportedArgs(),
- array('page' => '[pagename]', // just for a single page.
- 'withlinks' => 0,
- 'noheader' => false,
- 'exclude_from' => __("InterWikiMap"),
- 'limit' => '100',
- 'paging' => 'auto'));
+ array('page' => '', // just for a single page.
+ 'withlinks' => false,
+ 'noheader' => false,
+ 'exclude_from' => __("InterWikiMap"),
+ 'limit' => '100'));
 }
 
- // info arg allows multiple columns
- // info=mtime,hits,summary,version,author,locked,minor,markup or all
- // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
 /**
 * @param WikiDB $dbi
 * @param string $argstr
@@ -84,6 +77,16 @@
 
 extract($args);
 
+ if (!is_bool($withlinks)) {
+ if (($withlinks == '0') || ($withlinks == 'false')) {
+ $withlinks = false;
+ } elseif (($withlinks == '1') || ($withlinks == 'true')) {
+ $withlinks = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "withlinks"));
+ }
+ }
+
 if (!is_bool($noheader)) {
 if (($noheader == '0') || ($noheader == 'false')) {
 $noheader = false;
@@ -94,8 +97,6 @@
 }
 }
 
- if ($page == _("WantedPages")) $page = "";
-
 // There's probably a more memory-efficient way to do this (eg
 // a tailored SQL query via the backend, but this gets the job
 // done.
Modified: trunk/pgsrc/Help%2FWantedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FWantedPagesPlugin	2022年02月03日 16:05:35 UTC (rev 10975)
+++ trunk/pgsrc/Help%2FWantedPagesPlugin	2022年02月03日 17:37:36 UTC (rev 10976)
@@ -1,4 +1,4 @@
-Date: Thu, 3 Feb 2022 16:54:43 +0000
+Date: Thu, 3 Feb 2022 18:34:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWantedPagesPlugin;
@@ -27,12 +27,12 @@
 ! Default value
 |-
 | **page**
-| just for a single page
-| pagename
+| Just for a single page.
+| //empty/
 |-
 | **withlinks**
-| display links
-| 0
+| Boolean. If true, display links.
+| false
 |-
 | **noheader**
 | Boolean. If true, header should be omitted.
@@ -39,16 +39,12 @@
 | false
 |-
 | **exclude_from**
-| Comma-separated list of pages to exclude
+| Comma-separated list of pages to exclude.
 | InterWikiMap
 |-
 | **limit**
-| maximum number of wanted pages to display
+| Maximum number of wanted pages to display.
 | 100
-|-
-| **paging**
-|
-| auto
 |}
 
 == Example ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.