phpwiki-checkins Mailing List for PhpWiki

Revision: 8253
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8253&view=rev
Author: vargenau
Date: 2012年03月28日 15:41:01 +0000 (2012年3月28日)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
 trunk/lib/Units.php
Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php	2012年03月15日 16:24:51 UTC (rev 8252)
+++ trunk/lib/Units.php	2012年03月28日 15:41:01 UTC (rev 8253)
@@ -26,8 +26,8 @@
 if (DISABLE_UNITS)
 $this->errcode = 1;
 elseif (defined("UNITS_EXE")) // ignore dynamic check
- $this->errcode = 0;
- else
+ $this->errcode = 0;
+ else
 exec("units m2", $o, $this->errcode);
 }
 
@@ -35,30 +35,30 @@
 * $this->_attribute_base = $units->Definition($this->_attribute);
 */
 function Definition ($query) {
- static $Definitions = array();
- if (isset($Definitions[$query])) return $Definitions[$query];
- if ($this->errcode)
+ static $Definitions = array();
+ if (isset($Definitions[$query])) return $Definitions[$query];
+ if ($this->errcode)
 return $query;
- $query = preg_replace("/,/","", $query);
- if ($query == '' or $query == '*')
- return ($Definitions[$query] = '');
- // detect date values, currently only ISO: YYYY-MM-DD or YY-MM-DD
- if (preg_match("/^(\d{2,4})-(\d{1,2})-(\d{1,2})$/",$query, $m)) {
- $date = mktime(0,0,0,$m[2],$m[3],$m[1]);
- return ($Definitions[$query] = "$date date");
+ $query = preg_replace("/,/","", $query);
+ if ($query == '' or $query == '*')
+ return ($Definitions[$query] = '');
+ // detect date values, currently only ISO: YYYY-MM-DD or YY-MM-DD
+ if (preg_match("/^(\d{2,4})-(\d{1,2})-(\d{1,2})$/",$query, $m)) {
+ $date = mktime(0,0,0,$m[2],$m[3],$m[1]);
+ return ($Definitions[$query] = "$date date");
+ }
+ if (preg_match("/^(\d{2,4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{2}):?(\d{2})?$/",$query, $m)) {
+ $date = mktime($m[4],$m[5],@$m[6],$m[2],$m[3],$m[1]);
+ return ($Definitions[$query] = "$date date");
+ }
+ $def = $this->_cmd("\"$query\"");
+ if (preg_match("/Definition: (.+)$/",$def,$m))
+ return ($Definitions[$query] = $m[1]);
+ else {
+ trigger_error("units: ". $def, E_USER_WARNING);
+ return '';
+ }
 }
- if (preg_match("/^(\d{2,4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{2}):?(\d{2})?$/",$query, $m)) {
- $date = mktime($m[4],$m[5],@$m[6],$m[2],$m[3],$m[1]);
- return ($Definitions[$query] = "$date date");
- }
- $def = $this->_cmd("\"$query\"");
- if (preg_match("/Definition: (.+)$/",$def,$m))
- return ($Definitions[$query] = $m[1]);
- else {
- trigger_error("units: ". $def, E_USER_WARNING);
- return '';
- }
- }
 
 /**
 * We must ensure that the same baseunits are matched against.
@@ -66,37 +66,36 @@
 * $val_base = $this->_units->basevalue($value); // SemanticAttributeSearchQuery
 */
 function basevalue($query, $def = false) {
- if (!$def) $def = $this->Definition($query);
- if ($def) {
- if (is_numeric($def)) // e.g. "1 million"
- return $def;
- if (preg_match("/^([-0-9].*) \w.*$/",$def,$m))
- return $m[1];
+ if (!$def) $def = $this->Definition($query);
+ if ($def) {
+ if (is_numeric($def)) // e.g. "1 million"
+ return $def;
+ if (preg_match("/^([-0-9].*) \w.*$/",$def,$m))
+ return $m[1];
+ }
+ return '';
 }
- return '';
- }
 
 /**
 * $this->_unit = $units->baseunit($this->_attribute); // SemanticAttributeSearchQuery
 * and Cached_SemanticLink::_expandurl()
 */
 function baseunit($query, $def = false) {
- if (!$def) $def = $this->Definition($query);
- if ($def) {
- if (preg_match("/ (.+)$/",$def,$m))
- return $m[1];
+ if (!$def) $def = $this->Definition($query);
+ if ($def) {
+ if (preg_match("/ (.+)$/",$def,$m))
+ return $m[1];
+ }
+ return '';
 }
- return '';
- }
 
 function _cmd($args) {
- if ($this->errcode) return $args;
- if (defined("UNITS_EXE")) {
- $s = UNITS_EXE ." $args";
- $result = `$s`;
+ if ($this->errcode) return $args;
+ if (defined("UNITS_EXE")) {
+ $s = UNITS_EXE ." $args";
+ $result = `$s`;
+ } else
+ $result = `units $args`;
+ return trim($result);
 }
- else
- $result = `units $args`;
- return trim($result);
- }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8252
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8252&view=rev
Author: vargenau
Date: 2012年03月15日 16:24:51 +0000 (2012年3月15日)
Log Message:
-----------
Update wiki translations
Modified Paths:
--------------
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/de.po	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17: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."
@@ -382,8 +382,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -703,16 +703,16 @@
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
 
 # (namenlos=unbenannt; depends on interpretation)
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr "Unbenanntes PhpWiki"
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1804,7 +1804,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2612,7 +2612,7 @@
 msgid "%s or %s parameter missing"
 msgstr "%s oder %s Argument fehlt"
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, php-format
 msgid "Recursive inclusion of url %s"
 msgstr "Rekursiver Selbstaufruf der URL %s"
@@ -2692,7 +2692,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2700,7 +2700,7 @@
 msgid "Invalid argument %s"
 msgstr "Ungültiger Parameter %s"
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr "neues&nbsp;Fenster"
 
@@ -3191,7 +3191,7 @@
 msgstr ""
 "Tabellen unter Verwendung traditioneller (alter) Wikitext Formatierung."
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr "Zeile %s beginnt nicht mit '|'."
@@ -3526,7 +3526,7 @@
 "Beschreibungen"
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 "URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \""
@@ -4801,18 +4801,18 @@
 msgid "Transcluded page"
 msgstr "Eingebettete Seite"
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr "%s Argument fehlt"
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr "Siehe: %s"
 
 # Transclude is distinct from IncludePage
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr "Eingebetteter Text von %s"
@@ -5209,20 +5209,20 @@
 msgid "Watch Page"
 msgstr "Seite beobarchten"
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 msgid "You must sign in to watch pages."
 msgstr "Sie müssen sich anmelden um Seiten zu beobarchten."
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 #, fuzzy
 msgid "WatchPage cancelled"
 msgstr "SeiteBeobarten"
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/es.po	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17:24+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -380,8 +380,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -697,15 +697,15 @@
 msgid "%s: file not found"
 msgstr "%s: fichero no encontrado"
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr "GrupoCategoría"
 
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sin un nombre"
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1783,7 +1783,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2573,7 +2573,7 @@
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, php-format
 msgid "Recursive inclusion of url %s"
 msgstr ""
@@ -2653,7 +2653,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2661,7 +2661,7 @@
 msgid "Invalid argument %s"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr ""
 
@@ -3141,7 +3141,7 @@
 msgid "Layout tables using the old markup style."
 msgstr ""
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr ""
@@ -3447,7 +3447,7 @@
 msgstr ""
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
@@ -4691,17 +4691,17 @@
 msgid "Transcluded page"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr ""
@@ -5089,20 +5089,20 @@
 msgid "Watch Page"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 msgid "You must sign in to watch pages."
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 #, fuzzy
 msgid "WatchPage cancelled"
 msgstr "Cambio de la página"
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/fr.po	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17: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."
@@ -378,8 +378,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -696,15 +696,15 @@
 msgid "%s: file not found"
 msgstr "%s : fichier non trouvé"
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr "CatégorieGroupes"
 
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sans titre"
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1777,7 +1777,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2578,7 +2578,7 @@
 msgid "%s or %s parameter missing"
 msgstr "%s ou %s paramètre manquant"
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, php-format
 msgid "Recursive inclusion of url %s"
 msgstr "Insertion récursive de l'URL %s"
@@ -2658,7 +2658,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2666,7 +2666,7 @@
 msgid "Invalid argument %s"
 msgstr "Argument non valable %s"
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr ""
 
@@ -3151,7 +3151,7 @@
 msgid "Layout tables using the old markup style."
 msgstr "Apparences de tableaux utilisant l'ancien modèle de balisage."
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr "La ligne %s ne commence pas par un '|'."
@@ -3466,7 +3466,7 @@
 "descriptions facultatives."
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr "Mauvaise url dans la source : retirez tous les <, >, \""
 
@@ -4735,17 +4735,17 @@
 msgid "Transcluded page"
 msgstr "Page insérée"
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr "%s paramètre manquant"
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr "Voir : %s"
 
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr "Inséré de %s"
@@ -5141,20 +5141,20 @@
 msgid "Watch Page"
 msgstr "Surveiller"
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 msgid "You must sign in to watch pages."
 msgstr "Vous devez vous identifier pour surveiller des pages."
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 "ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos "
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 msgid "WatchPage cancelled"
 msgstr "Surveillance de la page annulée"
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/it.po	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17: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"
@@ -369,8 +369,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -687,15 +687,15 @@
 msgid "%s: file not found"
 msgstr "%s: file non trovato"
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr "CategoriaGruppo"
 
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1763,7 +1763,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2553,7 +2553,7 @@
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, php-format
 msgid "Recursive inclusion of url %s"
 msgstr ""
@@ -2633,7 +2633,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2641,7 +2641,7 @@
 msgid "Invalid argument %s"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr ""
 
@@ -3121,7 +3121,7 @@
 msgid "Layout tables using the old markup style."
 msgstr ""
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr ""
@@ -3427,7 +3427,7 @@
 msgstr ""
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
@@ -4667,17 +4667,17 @@
 msgid "Transcluded page"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr "Inserire dalla %s"
@@ -5065,20 +5065,20 @@
 msgid "Watch Page"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 msgid "You must sign in to watch pages."
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 #, fuzzy
 msgid "WatchPage cancelled"
 msgstr "CategoriaPagina"
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/ja.po	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17: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"
@@ -366,8 +366,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -675,15 +675,15 @@
 msgid "%s: file not found"
 msgstr "%s: ファイルが見つかりません。"
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1770,7 +1770,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2580,7 +2580,7 @@
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, php-format
 msgid "Recursive inclusion of url %s"
 msgstr ""
@@ -2660,7 +2660,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2668,7 +2668,7 @@
 msgid "Invalid argument %s"
 msgstr "インライン画像一覧"
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr ""
 
@@ -3162,7 +3162,7 @@
 msgid "Layout tables using the old markup style."
 msgstr ""
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr ""
@@ -3471,7 +3471,7 @@
 msgstr ""
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
@@ -4735,17 +4735,17 @@
 msgid "Transcluded page"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr "参照: %s"
 
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr ""
@@ -5143,21 +5143,21 @@
 msgid "Watch Page"
 msgstr "幅"
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 #, fuzzy
 msgid "You must sign in to watch pages."
 msgstr "%s としてサインインしました"
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 #, fuzzy
 msgid "WatchPage cancelled"
 msgstr "幅"
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/nl.po	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17: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"
@@ -372,8 +372,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -681,15 +681,15 @@
 msgid "%s: file not found"
 msgstr ""
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr "Naamloos PhpWiki"
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1755,7 +1755,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2545,7 +2545,7 @@
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, php-format
 msgid "Recursive inclusion of url %s"
 msgstr ""
@@ -2625,7 +2625,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2633,7 +2633,7 @@
 msgid "Invalid argument %s"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr ""
 
@@ -3113,7 +3113,7 @@
 msgid "Layout tables using the old markup style."
 msgstr ""
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr ""
@@ -3419,7 +3419,7 @@
 msgstr ""
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
@@ -4659,17 +4659,17 @@
 msgid "Transcluded page"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr ""
@@ -5057,19 +5057,19 @@
 msgid "Watch Page"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 msgid "You must sign in to watch pages."
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 msgid "WatchPage cancelled"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/phpwiki.pot	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17: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"
@@ -366,8 +366,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -675,15 +675,15 @@
 msgid "%s: file not found"
 msgstr ""
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1748,7 +1748,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2538,7 +2538,7 @@
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, php-format
 msgid "Recursive inclusion of url %s"
 msgstr ""
@@ -2618,7 +2618,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2626,7 +2626,7 @@
 msgid "Invalid argument %s"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr ""
 
@@ -3106,7 +3106,7 @@
 msgid "Layout tables using the old markup style."
 msgstr ""
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr ""
@@ -3412,7 +3412,7 @@
 msgstr ""
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
@@ -4652,17 +4652,17 @@
 msgid "Transcluded page"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr ""
@@ -5050,19 +5050,19 @@
 msgid "Watch Page"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 msgid "You must sign in to watch pages."
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 msgid "WatchPage cancelled"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/sv.po	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17:24+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -367,8 +367,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -676,15 +676,15 @@
 msgid "%s: file not found"
 msgstr "%s: fila ingen funna"
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1749,7 +1749,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2539,7 +2539,7 @@
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, php-format
 msgid "Recursive inclusion of url %s"
 msgstr ""
@@ -2620,7 +2620,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2628,7 +2628,7 @@
 msgid "Invalid argument %s"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr ""
 
@@ -3108,7 +3108,7 @@
 msgid "Layout tables using the old markup style."
 msgstr ""
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr ""
@@ -3414,7 +3414,7 @@
 msgstr ""
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
@@ -4654,17 +4654,17 @@
 msgid "Transcluded page"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr ""
@@ -5052,19 +5052,19 @@
 msgid "Watch Page"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 msgid "You must sign in to watch pages."
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 msgid "WatchPage cancelled"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012年03月15日 14:38:39 UTC (rev 8251)
+++ trunk/locale/po/zh.po	2012年03月15日 16:24:51 UTC (rev 8252)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012年01月27日 19:03+0100\n"
+"POT-Creation-Date: 2012年03月15日 17: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"
@@ -376,8 +376,8 @@
 msgstr ""
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -707,15 +707,15 @@
 msgid "%s: file not found"
 msgstr "%s: 找不到檔案."
 
-#: ../lib/IniConfig.php:993
+#: ../lib/IniConfig.php:994
 msgid "CategoryGroup"
 msgstr "CategoryGroup"
 
-#: ../lib/IniConfig.php:995
+#: ../lib/IniConfig.php:996
 msgid "An unnamed PhpWiki"
 msgstr "未被命名的 PhpWiki"
 
-#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:130
 #: ../themes/fusionforge/templates/navbar.tmpl:9
@@ -1821,7 +1821,7 @@
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77
 #: ../lib/plugin/CreateBib.php:111 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64
-#: ../lib/plugin/GoogleMaps.php:91 ../lib/plugin/GoogleMaps.php:94
+#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93
 #: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63
 #: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70
 #: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108
@@ -2644,7 +2644,7 @@
 msgid "%s or %s parameter missing"
 msgstr "%s 或 %s 參數遺漏"
 
-#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87
 #, fuzzy, php-format
 msgid "Recursive inclusion of url %s"
 msgstr "遞迴含括 url %s"
@@ -2724,7 +2724,7 @@
 "Displays a marker with further infos (when clicking) on given coordinates"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/GoogleMaps.php:102 ../lib/plugin/YouTube.php:104
 #: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
 #: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
 #: ../lib/plugin/YouTube.php:136
@@ -2732,7 +2732,7 @@
 msgid "Invalid argument %s"
 msgstr "錯誤的顏色值: %s"
 
-#: ../lib/plugin/GoogleMaps.php:123
+#: ../lib/plugin/GoogleMaps.php:122
 msgid "new&nbsp;window"
 msgstr ""
 
@@ -3234,7 +3234,7 @@
 msgid "Layout tables using the old markup style."
 msgstr "使用舊標記風格佈局的表格."
 
-#: ../lib/plugin/OldStyleTable.php:108
+#: ../lib/plugin/OldStyleTable.php:107
 #, fuzzy, php-format
 msgid "Line %s does not begin with a '|'."
 msgstr "線沒有以 '|' 為首."
@@ -3551,7 +3551,7 @@
 msgstr "顯示帶有簡單描述的文字檔內的相片集合"
 
 #: ../lib/plugin/PhotoAlbum.php:538 ../lib/plugin/PhotoAlbum.php:563
-#: ../lib/plugin/Transclude.php:91
+#: ../lib/plugin/Transclude.php:90
 msgid "Bad url in src: remove all of <, >, \""
 msgstr "在 src 中錯誤的 url: 移除所有的 <, .>, \""
 
@@ -4854,17 +4854,17 @@
 msgid "Transcluded page"
 msgstr "Transcluded 頁面"
 
-#: ../lib/plugin/Transclude.php:73
+#: ../lib/plugin/Transclude.php:72
 #, php-format
 msgid "%s parameter missing"
 msgstr "%s 參數遺漏"
 
-#: ../lib/plugin/Transclude.php:103
+#: ../lib/plugin/Transclude.php:102
 #, php-format
 msgid "See: %s"
 msgstr "參閱: %s"
 
-#: ../lib/plugin/Transclude.php:118
+#: ../lib/plugin/Transclude.php:117
 #, php-format
 msgid "Transcluded from %s"
 msgstr "Transcluded 從 %s"
@@ -5267,21 +5267,21 @@
 msgid "Watch Page"
 msgstr "寬度"
 
-#: ../lib/plugin/WatchPage.php:110
+#: ../lib/plugin/WatchPage.php:109
 #, fuzzy
 msgid "You must sign in to watch pages."
 msgstr "你必須簽入才能 %s."
 
-#: ../lib/plugin/WatchPage.php:121
+#: ../lib/plugin/WatchPage.php:120
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:138
+#: ../lib/plugin/WatchPage.php:137
 #, fuzzy
 msgid "WatchPage cancelled"
 msgstr "寬度"
 
-#: ../lib/plugin/WatchPage.php:160
+#: ../lib/plugin/WatchPage.php:159
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
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: 8251
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8251&view=rev
Author: vargenau
Date: 2012年03月15日 14:38:39 +0000 (2012年3月15日)
Log Message:
-----------
Add page PhpWikiAdministration/SetExternal for Fusionforge
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Added Paths:
-----------
 trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012年03月15日 14:37:36 UTC (rev 8250)
+++ trunk/lib/IniConfig.php	2012年03月15日 14:38:39 UTC (rev 8251)
@@ -788,6 +788,7 @@
 if (FUSIONFORGE) {
 if (ENABLE_EXTERNAL_PAGES) {
 $AllAllowedPlugins[] = 'WikiAdminSetExternal';
+ $AllActionPages[] = 'PhpWikiAdministration/SetExternal';
 $AllActionPages[] = 'ExternalPages';
 }
 }
Added: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal	 (rev 0)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal	2012年03月15日 14:38:39 UTC (rev 8251)
@@ -0,0 +1,14 @@
+Date: 2012年3月15日 15:31:39 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=PhpWikiAdministration%2FSetExternal;
+ flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<<WikiAdminSetExternal>>
+
+----
+[[CategoryActionPage]]
Property changes on: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
___________________________________________________________________
Added: svn:keywords
 + Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8250
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8250&view=rev
Author: vargenau
Date: 2012年03月15日 14:37:36 +0000 (2012年3月15日)
Log Message:
-----------
Remove unused argument
Modified Paths:
--------------
 trunk/lib/plugin/WikicreoleTable.php
Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2012年03月15日 14:36:26 UTC (rev 8249)
+++ trunk/lib/plugin/WikicreoleTable.php	2012年03月15日 14:37:36 UTC (rev 8250)
@@ -84,7 +84,7 @@
 $line = substr($line, 0, -1);
 }
 if ($line[0] == '|') {
- $table[] = $this->_parse_row($line, $basepage);
+ $table[] = $this->_parse_row($line);
 }
 }
 
@@ -130,7 +130,7 @@
 return $htmltable;
 }
 
- function _parse_row ($line, $basepage) {
+ function _parse_row ($line) {
 $brkt_link = "\\[ .*? [^]\s] .*? \\]";
 $cell_content = "(?: [^[] | ".ESCAPE_CHAR."\\[ | $brkt_link )*?";
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8249
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8249&view=rev
Author: vargenau
Date: 2012年03月15日 14:36:26 +0000 (2012年3月15日)
Log Message:
-----------
Fix "ab " search problem (quotes and space)
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2012年03月15日 13:08:39 UTC (rev 8248)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2012年03月15日 14:36:26 UTC (rev 8249)
@@ -607,7 +607,7 @@
 	 // TODO: title still ignored, need better rank and subselect
 $callback = new WikiMethodCb($searchobj, "_fulltext_match_clause");
 $search_string = $search->makeTsearch2SqlClauseObj($callback);
- $search_string = str_replace(array("%"," "), array("","&"), $search_string);
+ $search_string = str_replace('%', '', $search_string);
 $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND (";
 
 $search_clause .= "idxFTI @@ to_tsquery('$search_string')";
@@ -691,7 +691,7 @@
 */
 function _fulltext_match_clause($node) {
 $word = strtolower($node->word);
- $word = str_replace(" ", "&", $word); // phrase fix
+ // $word = str_replace(" ", "&", $word); // phrase fix
 
 // @alu: use _quote maybe instead of direct pg_escape_string
 $word = pg_escape_string($word);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8248
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8248&view=rev
Author: vargenau
Date: 2012年03月15日 13:08:39 +0000 (2012年3月15日)
Log Message:
-----------
Remove unused global
Modified Paths:
--------------
 trunk/lib/plugin/GoogleMaps.php
 trunk/lib/plugin/OldStyleTable.php
 trunk/lib/plugin/RichTable.php
 trunk/lib/plugin/Transclude.php
 trunk/lib/plugin/WatchPage.php
 trunk/lib/plugin/WikicreoleTable.php
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2012年03月14日 17:23:33 UTC (rev 8247)
+++ trunk/lib/plugin/GoogleMaps.php	2012年03月15日 13:08:39 UTC (rev 8248)
@@ -82,7 +82,6 @@
 }
 
 function run($dbi, $argstr, &$request, $basepage) {
- global $WikiTheme;
 
 $args = $this->getArgs($argstr, $request);
 extract($args);
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2012年03月14日 17:23:33 UTC (rev 8247)
+++ trunk/lib/plugin/OldStyleTable.php	2012年03月15日 13:08:39 UTC (rev 8248)
@@ -69,7 +69,6 @@
 }
 
 function run($dbi, $argstr, &$request, $basepage) {
- global $WikiTheme;
 include_once('lib/InlineParser.php');
 
 $args = $this->getArgs($argstr, $request);
Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php	2012年03月14日 17:23:33 UTC (rev 8247)
+++ trunk/lib/plugin/RichTable.php	2012年03月15日 13:08:39 UTC (rev 8248)
@@ -43,7 +43,6 @@
 }
 
 function run($dbi, $argstr, &$request, $basepage) {
- global $WikiTheme;
 include_once("lib/BlockParser.php");
 // RichTablePlugin markup is new.
 $markup = 2.0;
Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2012年03月14日 17:23:33 UTC (rev 8247)
+++ trunk/lib/plugin/Transclude.php	2012年03月15日 13:08:39 UTC (rev 8248)
@@ -64,7 +64,6 @@
 }
 
 function run($dbi, $argstr, &$request, $basepage) {
- global $WikiTheme;
 
 $args = ($this->getArgs($argstr, $request));
 extract($args);
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2012年03月14日 17:23:33 UTC (rev 8247)
+++ trunk/lib/plugin/WatchPage.php	2012年03月15日 13:08:39 UTC (rev 8248)
@@ -94,7 +94,6 @@
 }
 
 function run($dbi, $argstr, &$request, $basepage) {
- global $WikiTheme;
 
 $args = $this->getArgs($argstr, $request);
 if (isa($request,'MockRequest'))
Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2012年03月14日 17:23:33 UTC (rev 8247)
+++ trunk/lib/plugin/WikicreoleTable.php	2012年03月15日 13:08:39 UTC (rev 8248)
@@ -68,7 +68,6 @@
 }
 
 function run($dbi, $argstr, &$request, $basepage) {
- global $WikiTheme;
 include_once('lib/InlineParser.php');
 
 $table = array();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8247
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8247&view=rev
Author: vargenau
Date: 2012年03月14日 17:23:33 +0000 (2012年3月14日)
Log Message:
-----------
Do not execute example
Modified Paths:
--------------
 trunk/pgsrc/Help%2FAtomFeedPlugin
Modified: trunk/pgsrc/Help%2FAtomFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FAtomFeedPlugin	2012年03月14日 15:54:29 UTC (rev 8246)
+++ trunk/pgsrc/Help%2FAtomFeedPlugin	2012年03月14日 17:23:33 UTC (rev 8247)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2012年3月14日 18:22:33 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -51,12 +51,9 @@
 
 {{{
 <<AtomFeed feed=PHPNews description="PHP News"
- url=http://www.php.net/feed.atom titleonly=true maxitem=5>>
+ url=http://www.php.net/feed.atom titleonly=true maxitem=5>>
 }}}
 
-<<AtomFeed feed=PHPNews description="PHP News"
- url=http://www.php.net/feed.atom titleonly=true maxitem=5>>
-
 == Author ==
 * [[PhpWiki:SebastienLeCallonnec|Sébastien Le Callonnec]]
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8246
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8246&view=rev
Author: vargenau
Date: 2012年03月14日 15:54:29 +0000 (2012年3月14日)
Log Message:
-----------
embed tag is empty
Modified Paths:
--------------
 trunk/lib/HtmlElement5.php
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php	2012年03月06日 16:16:54 UTC (rev 8245)
+++ trunk/lib/HtmlElement5.php	2012年03月14日 15:54:29 UTC (rev 8246)
@@ -424,7 +424,7 @@
 
 
 HTML::_setTagProperty(HTMLTAG_EMPTY,
- 'area base basefont br col frame hr img input isindex link meta param');
+ 'area base basefont br col embed frame hr img input isindex link meta param');
 HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
 // %inline elements:
 'b big i small tt ' // %fontstyle
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8245
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8245&view=rev
Author: vargenau
Date: 2012年03月06日 16:16:54 +0000 (2012年3月06日)
Log Message:
-----------
Fix bug 3492111: add space after "--" in comments
Modified Paths:
--------------
 trunk/schemas/mssql-destroy.sql
 trunk/schemas/mssql-initialize.sql
 trunk/schemas/mysql-destroy.sql
 trunk/schemas/oci8-destroy.sql
 trunk/schemas/oci8-initialize.sql
 trunk/schemas/psql-1_3_12.sql
 trunk/schemas/psql-destroy.sql
 trunk/schemas/psql-initialize.sql
 trunk/schemas/psql-tsearch2.sql
 trunk/schemas/sqlsrv-destroy.sql
 trunk/schemas/sqlsrv-initialize.sql
Modified: trunk/schemas/mssql-destroy.sql
===================================================================
--- trunk/schemas/mssql-destroy.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/mssql-destroy.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -8,7 +8,7 @@
 DROP TABLE session;
 
 DROP TABLE pref;
---DROP TABLE user;
+-- DROP TABLE user;
 DROP TABLE member;
 
 -- wikilens theme
Modified: trunk/schemas/mssql-initialize.sql
===================================================================
--- trunk/schemas/mssql-initialize.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/mssql-initialize.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -71,12 +71,12 @@
 -- deprecated since 1.3.12. only useful for seperate databases.
 -- better use the extra pref table where such users can be created easily 
 -- without password.
---CREATE TABLE user (
+-- CREATE TABLE user (
 -- 	userid 	CHAR(48) NOT NULL,
 -- 	passwd 	CHAR(48) DEFAULT '',
 --	prefs 	TEXT NULL DEFAULT '',
 --	groupname CHAR(48) DEFAULT 'users'
---);
+-- );
 
 -- Use the member table, if you need it for n:m user-group relations,
 -- and adjust your DBAUTH_AUTH_ SQL statements.
Modified: trunk/schemas/mysql-destroy.sql
===================================================================
--- trunk/schemas/mysql-destroy.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/mysql-destroy.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -10,7 +10,7 @@
 -- upgrade from 1.3.7:
 
 drop table if exists pref;
---drop table if exists user;
+-- drop table if exists user;
 drop table if exists member;
 drop table if exists accesslog;
 
Modified: trunk/schemas/oci8-destroy.sql
===================================================================
--- trunk/schemas/oci8-destroy.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/oci8-destroy.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -3,7 +3,7 @@
 set verify off
 set feedback off
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specify for
@@ -14,13 +14,13 @@
 
 define prefix=phpwiki_
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
---================================================================
+-- ================================================================
 -- Note on Oracle datatypes...
 -- 
 -- Most of the 'NOT NULL' constraints on the character columns have been 
Modified: trunk/schemas/oci8-initialize.sql
===================================================================
--- trunk/schemas/oci8-initialize.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/oci8-initialize.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -3,7 +3,7 @@
 set verify off
 set feedback off
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specify for
@@ -14,13 +14,13 @@
 
 define prefix=phpwiki_
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
---================================================================
+-- ================================================================
 -- Note on Oracle datatypes...
 -- 
 -- Most of the 'NOT NULL' constraints on the character columns have been 
@@ -63,8 +63,8 @@
 define pref_tbl=&prefix.pref
 define pref_id=&prefix.pref_id
 
---define user_tbl=&prefix.user
---define user_id=&prefix.user_id
+-- define user_tbl=&prefix.user
+-- define user_id=&prefix.user_id
 
 define member_tbl=&prefix.member
 define member_userid=&prefix.member_userid
@@ -157,14 +157,14 @@
 
 -- better use the extra pref table where such users can be created easily 
 -- without password.
---prompt Creating &user_tbl
---CREATE TABLE &user_tbl (
+-- prompt Creating &user_tbl
+-- CREATE TABLE &user_tbl (
 -- 	userid 	CHAR(48) NOT NULL,
 -- 	passwd 	CHAR(48) DEFAULT '',
 --	prefs 	CLOB DEFAULT '',
 --	groupname CHAR(48) DEFAULT 'users',
 -- 	CONSTRAINT &user_id PRIMARY KEY (userid)
---);
+-- );
 
 prompt Creating &member_tbl
 CREATE TABLE &member_tbl (
Modified: trunk/schemas/psql-1_3_12.sql
===================================================================
--- trunk/schemas/psql-1_3_12.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/psql-1_3_12.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -8,7 +8,7 @@
 -- $ /usr/bin/psql phpwiki < /usr/share/postgresql/contrib/tsearch2.sql 
 -- $ /usr/bin/psql phpwiki < psql-initialize.sql
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specified for
@@ -16,7 +16,7 @@
 
 \set prefix 	''
 
---================================================================
+-- ================================================================
 -- Which postgres user gets access to the tables?
 --
 -- You should set this to the name of the postgres
@@ -28,11 +28,11 @@
 
 \set httpd_user	'phpwiki'
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
 \set page_tbl 		:prefix 'page'
 \set page_id_seq 	:prefix 'page_id_seq'
@@ -61,8 +61,8 @@
 
 \set pref_tbl 	 	:prefix 'pref'
 \set pref_id_idx 	:prefix 'pref_id_idx'
---\set user_tbl 	 	:prefix 'users'
---\set user_id_idx 	:prefix 'users_id_idx'
+-- \set user_tbl 	 	:prefix 'users'
+-- \set user_id_idx 	:prefix 'users_id_idx'
 \set member_tbl 	:prefix 'member'
 \set member_id_idx 	:prefix 'member_id_idx'
 \set member_group_idx 	:prefix 'member_group_idx'
@@ -74,7 +74,7 @@
 \set accesslog_time_idx :prefix 'log_time_idx'
 \set accesslog_host_idx :prefix 'log_host_idx'
 
---================================================================
+-- ================================================================
 \echo schema enhancements
 
 ALTER TABLE :page_tbl 
@@ -121,7 +121,7 @@
 	ALTER COLUMN userid SET NOT NULL,
 	ADD FOREIGN KEY (userid) REFERENCES :pref_tbl;
 
---================================================================
+-- ================================================================
 
 \echo add tsearch2 fulltextsearch extension
 -- Use the tsearch2 fulltextsearch extension: (recommended) 7.4, 8.0, 8.1
@@ -143,7 +143,7 @@
 CREATE TRIGGER tsvectorupdate BEFORE UPDATE OR INSERT ON :version_tbl
 FOR EACH ROW EXECUTE PROCEDURE tsearch2(idxFTI, content);
 
---================================================================
+-- ================================================================
 
 \echo Initializing stored procedures
 
Modified: trunk/schemas/psql-destroy.sql
===================================================================
--- trunk/schemas/psql-destroy.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/psql-destroy.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -2,7 +2,7 @@
 
 \set QUIET
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specify for
@@ -10,11 +10,11 @@
 
 \set prefix 	''
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
 \set qprefix '\'' :prefix '\''
 \echo Dropping all PhpWiki tables with:
@@ -29,7 +29,7 @@
 \set link_tbl		:prefix 'link'
 \set session_tbl	:prefix 'session'
 \set pref_tbl		:prefix 'pref'
---\set user_tbl	 :prefix 'user'
+-- \set user_tbl	 :prefix 'user'
 \set member_tbl 	:prefix 'member'
 \set rating_tbl		:prefix 'rating'
 \set accesslog_tbl	:prefix 'accesslog'
@@ -78,8 +78,8 @@
 \echo Dropping table :pref_tbl
 DROP TABLE :pref_tbl;
 
---\echo Dropping table :user_tbl
---DROP TABLE :user_tbl;
+-- \echo Dropping table :user_tbl
+-- DROP TABLE :user_tbl;
 
 \echo Dropping table :session_tbl
 DROP TABLE :session_tbl;
Modified: trunk/schemas/psql-initialize.sql
===================================================================
--- trunk/schemas/psql-initialize.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/psql-initialize.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -2,7 +2,7 @@
 
 \set QUIET
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specify for
@@ -10,7 +10,7 @@
 
 \set prefix 	''
 
---================================================================
+-- ================================================================
 -- Which postgres user gets access to the tables?
 --
 -- You should set this to the name of the postgres
@@ -27,11 +27,11 @@
 
 \set httpd_user	'wikiuser'
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
 \set qprefix '\'' :prefix '\''
 \set qhttp_user '\'' :httpd_user '\''
@@ -85,8 +85,8 @@
 
 \set pref_tbl 	 	:prefix 'pref'
 \set pref_id_idx 	:prefix 'pref_id_idx'
---\set user_tbl 	 	:prefix 'users'
---\set user_id_idx 	:prefix 'users_id_idx'
+-- \set user_tbl 	 	:prefix 'users'
+-- \set user_id_idx 	:prefix 'users_id_idx'
 \set member_tbl 	:prefix 'member'
 \set member_id_idx 	:prefix 'member_id_idx'
 \set member_group_idx 	:prefix 'member_group_idx'
@@ -107,7 +107,7 @@
 pagename 	VARCHAR(100) NOT NULL UNIQUE CHECK (pagename <> ''),
 	hits 		INT4 NOT NULL DEFAULT 0,
 pagedata 	TEXT NOT NULL DEFAULT '',
-	--cached_html 	bytea DEFAULT ''
+	-- cached_html 	bytea DEFAULT ''
 	cached_html 	TEXT DEFAULT ''
 );
 -- CREATE UNIQUE INDEX :page_id_idx ON :page_tbl (id);
@@ -218,9 +218,9 @@
 );
 CREATE UNIQUE INDEX :rating_id_idx ON :rating_tbl (dimension, raterpage, rateepage);
 
---================================================================
+-- ================================================================
 -- end of page relations
---================================================================
+-- ================================================================
 
 \echo Creating :session_tbl
 CREATE TABLE :session_tbl (
@@ -280,7 +280,7 @@
 CREATE INDEX :accesslog_host_idx ON :accesslog_tbl (remote_host);
 -- create extra indices on demand (usually referer. see plugin/AccessLogSql)
 
---================================================================
+-- ================================================================
 
 -- Use the tsearch2 fulltextsearch extension: (recommended) 7.4, 8.0, 8.1
 -- at first init it for the database:
@@ -305,7 +305,7 @@
 -- see http://www.sai.msu.su/~megera/oddmuse/index.cgi/Tsearch_V2_Notes
 -- update pg_ts_cfg set locale='en_US.UTF-8' where ts_name='default';
 
---================================================================
+-- ================================================================
 
 \echo You might want to ignore the following errors or run 
 \echo /usr/sbin/createuser -S -R -d :httpd_user
@@ -325,7 +325,7 @@
 GRANT SELECT,INSERT,UPDATE,DELETE ON :rating_tbl	TO :httpd_user;
 GRANT SELECT,INSERT,UPDATE,DELETE ON :accesslog_tbl	TO :httpd_user;
 
---================================================================
+-- ================================================================
 -- some stored procedures to put unneccesary syntax into the server
 
 \echo Initializing stored procedures
Modified: trunk/schemas/psql-tsearch2.sql
===================================================================
--- trunk/schemas/psql-tsearch2.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/psql-tsearch2.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -7,20 +7,20 @@
 \set prefix 	''
 \set httpd_user	'phpwiki'
 
---example of ISpell dictionary:
+-- example of ISpell dictionary:
 -- UPDATE pg_ts_dict SET dict_initoption='DictFile="/usr/local/share/ispell/russian.dict" ,AffFile ="/usr/local/share/ispell/russian.aff", StopFile="/usr/local/share/ispell/russian.stop"' WHERE dict_name='ispell_template';
---example of synonym dict:
+-- example of synonym dict:
 -- UPDATE pg_ts_dict SET dict_initoption='/usr/local/share/ispell/english.syn' WHERE dict_id=5; 
 
 -- this might be needed:
 -- see http://www.sai.msu.su/~megera/oddmuse/index.cgi/Tsearch_V2_Notes
 -- update pg_ts_cfg set locale='en_US.UTF-8' where ts_name='default';
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
 \set qprefix '\'' :prefix '\''
 \set qhttp_user '\'' :httpd_user '\''
Modified: trunk/schemas/sqlsrv-destroy.sql
===================================================================
--- trunk/schemas/sqlsrv-destroy.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/sqlsrv-destroy.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -8,7 +8,7 @@
 DROP TABLE session;
 
 DROP TABLE pref;
---DROP TABLE user;
+-- DROP TABLE user;
 DROP TABLE member;
 
 -- wikilens theme
Modified: trunk/schemas/sqlsrv-initialize.sql
===================================================================
--- trunk/schemas/sqlsrv-initialize.sql	2012年03月05日 08:49:38 UTC (rev 8244)
+++ trunk/schemas/sqlsrv-initialize.sql	2012年03月06日 16:16:54 UTC (rev 8245)
@@ -26,14 +26,14 @@
 PRIMARY KEY (id),
 	UNIQUE (pagename)
 );
---SET IDENTITY_INSERT page ON;
+-- SET IDENTITY_INSERT page ON;
 
 CREATE TABLE version (
 	id INT NOT NULL,
 version INT NOT NULL,
 	mtime INT NOT NULL,
 	minor_edit TINYINT DEFAULT 0,
- content varchar(max) NOT NULL DEFAULT '',--can't be text
+ content varchar(max) NOT NULL DEFAULT '', -- can't be text
 versiondata TEXT NOT NULL DEFAULT '',
 PRIMARY KEY (id,version)
 );
@@ -89,12 +89,12 @@
 -- deprecated since 1.3.12. only useful for seperate databases.
 -- better use the extra pref table where such users can be created easily 
 -- without password.
---CREATE TABLE user (
+-- CREATE TABLE user (
 -- 	userid 	CHAR(48) NOT NULL,
 -- 	passwd 	CHAR(48) DEFAULT '',
 --	prefs 	TEXT NULL DEFAULT '',
 --	groupname CHAR(48) DEFAULT 'users'
---);
+-- );
 
 -- Use the member table, if you need it for n:m user-group relations,
 -- and adjust your DBAUTH_AUTH_ SQL statements.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8244
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8244&view=rev
Author: vargenau
Date: 2012年03月05日 08:49:38 +0000 (2012年3月05日)
Log Message:
-----------
Avoid warning for function getConflictMessage
Modified Paths:
--------------
 trunk/lib/editpage.php
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2012年03月01日 11:58:38 UTC (rev 8243)
+++ trunk/lib/editpage.php	2012年03月05日 08:49:38 UTC (rev 8244)
@@ -941,7 +941,7 @@
 return true;
 }
 
- function getConflictMessage () {
+ function getConflictMessage ($unresolved = false) {
 $message = HTML(HTML::p(fmt("Some of the changes could not automatically be combined. Please look for sections beginning with '%s', and ending with '%s'. You will need to edit those sections by hand before you click Save.",
 "<<<<<<<",
 "======="),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8243
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8243&view=rev
Author: vargenau
Date: 2012年03月01日 11:58:38 +0000 (2012年3月01日)
Log Message:
-----------
Be consistent in function declarations
Modified Paths:
--------------
 trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2012年03月01日 11:36:35 UTC (rev 8242)
+++ trunk/lib/PageType.php	2012年03月01日 11:58:38 UTC (rev 8243)
@@ -340,7 +340,7 @@
 // New policy: default = new markup (old crashes quite often)
 }
 
- function _transform(&$text) {
+ function _transform($text) {
 include_once('lib/BlockParser.php');
 return TransformText($text, $this->_markup);
 }
@@ -357,8 +357,8 @@
 
 class PageFormatter_wikitext extends PageFormatter
 {
- function format(&$text) {
- return HTML::div(array('class' => 'wikitext'),
+ function format($text) {
+ return HTML::div(array('class' => 'wikitext'),
 $this->_transform($text));
 }
 }
@@ -466,7 +466,7 @@
 class PageFormatter_html extends PageFormatter
 {
 function _transform($text) {
- return $text;
+ return $text;
 }
 function format($text) {
 return $text;
@@ -529,7 +529,7 @@
 
 class PageFormatter_MediaWiki extends PageFormatter
 {
- function _transform(&$text) {
+ function _transform($text) {
 include_once('lib/BlockParser.php');
 // Expand leading tabs.
 $text = expand_tabs($text);
@@ -539,7 +539,7 @@
 return new XmlContent($output->getContent());
 }
 
- function format(&$text) {
+ function format($text) {
 return HTML::div(array('class' => 'wikitext'),
 $this->_transform($text));
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8242
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8242&view=rev
Author: vargenau
Date: 2012年03月01日 11:36:35 +0000 (2012年3月01日)
Log Message:
-----------
Add "public static" for function getTagProperties
Modified Paths:
--------------
 trunk/lib/HtmlElement5.php
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php	2012年02月02日 10:33:03 UTC (rev 8241)
+++ trunk/lib/HtmlElement5.php	2012年03月01日 11:36:35 UTC (rev 8242)
@@ -127,7 +127,7 @@
 return new RawXml($html_text);
 }
 
- function getTagProperties($tag) {
+ public static function getTagProperties($tag) {
 $props = &$GLOBALS['HTML_TagProperties'];
 return isset($props[$tag]) ? $props[$tag] : 0;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.