Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9413] trunk
|
From: <var...@us...> - 2014-12-03 16:15:40
|
Revision: 9413
http://sourceforge.net/p/phpwiki/code/9413
Author: vargenau
Date: 2014-12-03 16:15:36 +0000 (Wed, 03 Dec 2014)
Log Message:
-----------
Better error message for limit
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/WikiDB/backend.php
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/OrphanedPages.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.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/PageList.php
===================================================================
--- trunk/lib/PageList.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/PageList.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -1512,7 +1512,7 @@
if (is_array($limit)) {
list($from, $count) = $limit;
if ((!empty($from) && !is_numeric($from)) or (!empty($count) && !is_numeric($count))) {
- trigger_error(_("Illegal 'limit' argument: must be numeric"));
+ trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
return array(0, 0);
}
return $limit;
@@ -1520,13 +1520,13 @@
if (strstr($limit, ',')) {
list($from, $limit) = explode(',', $limit);
if ((!empty($from) && !is_numeric($from)) or (!empty($limit) && !is_numeric($limit))) {
- trigger_error(_("Illegal 'limit' argument: must be numeric"));
+ trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
return array(0, 0);
}
return array($from, $limit);
} else {
if (!empty($limit) && !is_numeric($limit)) {
- trigger_error(_("Illegal 'limit' argument: must be numeric"));
+ trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
return array(0, 0);
}
return array(0, $limit);
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/WikiDB/backend.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -554,13 +554,13 @@
if (strstr($limit, ',')) {
list($from, $limit) = explode(',', $limit);
if ((!empty($from) && !is_numeric($from)) or (!empty($limit) && !is_numeric($limit))) {
- trigger_error(_("Illegal 'limit' argument: must be numeric"));
+ trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
return array(0, 0);
}
return array($from, $limit);
} else {
if (!empty($limit) && !is_numeric($limit)) {
- trigger_error(_("Illegal 'limit' argument: must be numeric"));
+ trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
return array(0, 0);
}
return array(0, $limit);
Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/AllPages.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -66,7 +66,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
if (empty($args['sortby'])) {
Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/AllUsers.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -70,7 +70,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
extract($args);
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/BackLinks.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -61,7 +61,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
extract($args);
Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/IncludePages.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -57,7 +57,7 @@
if (isset($args['limit']) && !limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
$html = HTML();
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/LinkDatabase.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -103,7 +103,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
$caption = _("All pages with all links in this wiki (%d total):");
Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/ListSubpages.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -66,7 +66,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
if ($args['basepage'])
Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/MostPopular.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -66,7 +66,7 @@
if (isset($limit) && !is_limit($limit)) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
if (strstr($sortby, 'mtime')) {
return HTML::p(array('class' => "error"),
Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/OrphanedPages.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -64,7 +64,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
extract($args);
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/PageHistory.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -343,7 +343,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::div(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
$pagename = $args['page'];
Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/PopularNearby.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -67,7 +67,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::div(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
extract($args);
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/TitleSearch.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -80,7 +80,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
if (empty($args['s'])) {
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/WantedPages.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -71,7 +71,7 @@
if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
if (!empty($args['exclude_from']))
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/lib/plugin/WantedPagesOld.php 2014-12-03 16:15:36 UTC (rev 9413)
@@ -63,7 +63,7 @@
if (isset($limit) && !is_limit($limit)) {
return HTML::p(array('class' => "error"),
- _("Illegal 'limit' argument: must be numeric"));
+ _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
if ($exclude) {
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 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/de.po 2014-12-03 16:15:36 UTC (rev 9413)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+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."
@@ -1122,7 +1122,9 @@
msgid "minor"
msgstr "kleinere"
-msgid "Illegal 'limit' argument: must be numeric"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
msgstr ""
msgid "Rename"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/es.po 2014-12-03 16:15:36 UTC (rev 9413)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1103,7 +1103,9 @@
msgid "minor"
msgstr "de menor importancia"
-msgid "Illegal 'limit' argument: must be numeric"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
msgstr ""
msgid "Rename"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/fr.po 2014-12-03 16:15:36 UTC (rev 9413)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+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."
@@ -1103,8 +1103,12 @@
msgid "minor"
msgstr "mineur"
-msgid "Illegal 'limit' argument: must be numeric"
-msgstr "Valeur illégale pour l'argument 'limit' : ce doit être un nombre"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
+msgstr ""
+"Valeur illégale pour l'argument « limit » : ce doit être un entier ou deux "
+"entiers séparés par une virgule"
msgid "Rename"
msgstr "Renommer"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/it.po 2014-12-03 16:15:36 UTC (rev 9413)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+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"
@@ -1087,7 +1087,9 @@
msgid "minor"
msgstr ""
-msgid "Illegal 'limit' argument: must be numeric"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
msgstr ""
msgid "Rename"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/ja.po 2014-12-03 16:15:36 UTC (rev 9413)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+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"
@@ -1087,7 +1087,9 @@
msgid "minor"
msgstr ""
-msgid "Illegal 'limit' argument: must be numeric"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
msgstr ""
#, fuzzy
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/nl.po 2014-12-03 16:15:36 UTC (rev 9413)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+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"
@@ -1078,7 +1078,9 @@
msgid "minor"
msgstr ""
-msgid "Illegal 'limit' argument: must be numeric"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
msgstr ""
msgid "Rename"
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/phpwiki.pot 2014-12-03 16:15:36 UTC (rev 9413)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+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"
@@ -1072,7 +1072,9 @@
msgid "minor"
msgstr ""
-msgid "Illegal 'limit' argument: must be numeric"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
msgstr ""
msgid "Rename"
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/sv.po 2014-12-03 16:15:36 UTC (rev 9413)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -1073,7 +1073,9 @@
msgid "minor"
msgstr ""
-msgid "Illegal 'limit' argument: must be numeric"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
msgstr ""
msgid "Rename"
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2014-12-03 15:32:04 UTC (rev 9412)
+++ trunk/locale/po/zh.po 2014-12-03 16:15:36 UTC (rev 9413)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 17:59+0100\n"
+"POT-Creation-Date: 2014-12-03 17:13+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1119,7 +1119,9 @@
msgid "minor"
msgstr "次要"
-msgid "Illegal 'limit' argument: must be numeric"
+msgid ""
+"Illegal “limit” argument: must be an integer or two integers separated by "
+"comma"
msgstr ""
msgid "Rename"
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.
|
