phpwiki-checkins Mailing List for PhpWiki

Revision: 9772
 http://sourceforge.net/p/phpwiki/code/9772
Author: vargenau
Date: 2016年01月29日 13:32:57 +0000 (2016年1月29日)
Log Message:
-----------
Update Help/WikisUsingPhpWiki
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWikisUsingPhpWiki
Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016年01月27日 16:55:18 UTC (rev 9771)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016年01月29日 13:32:57 UTC (rev 9772)
@@ -1,4 +1,4 @@
-Date: 2016年1月27日 17:53:58 +0000
+Date: 2016年1月29日 14:32:30 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWikisUsingPhpWiki
@@ -9,13 +9,14 @@
 Here are some wikis using ~PhpWiki:
 
 |= URL |= ~PhpWiki release
+| http://adammoore.me.uk | ??
 | http://alsach.at/phpwiki/ | 1.4.0RC1
 | http://bayernprovider.info | 1.4.0RC1
 | http://bh.hallikainen.org | 1.5.4
 | http://brainyplanet.com | 1.3.11p1
 | http://crdo.up.univ-aix.fr/phpwiki/ | 1.3.14
 | http://danm.ucsc.edu/web/ | 1.3.14
-| http://dev.cmeerw.org/HomePage | 1.5.5
+| http://dev.cmeerw.org | 1.5.5
 | http://drtedwilliams.net/kb/ | 1.3.14
 | http://esk.uz | 1.3.14
 | http://helpdesk.razorline.com/wiki/ | 1.4.0RC1
@@ -28,30 +29,39 @@
 | http://neckbeard.us/HomePage | 1.5.4
 | http://nextdoordiscount.com/nydba/ | 1.4.0RC1
 | http://ohg82er.de/wiki/index.php/StartSeite | 1.3.2-jeffs-hacks
+| http://oldwiki.mingw.org | 1.3.14
+| http://open-innovation.alcatel-lucent.com/wiki/g/help/ | 1.3.14
 | http://pcsgwiki.com/wiki/ | 1.3.14
 | http://php-rql.dnsalias.net/wiki/ | 1.4.0RC1
 | http://profit.colegiolasalleguaparo.edu.ve/wiki/ | 1.3.14
 | http://rec-puzzles.org | 1.3.11p1
 | http://rhythsmbox.com/wiki/index.php | 1.4.0RC1
 | http://sldr-test.lpl-aix.fr/phpwiki/ | 1.3.14
-| https://open-innovation.alcatel-lucent.com/wiki/g/help/ | 1.3.14
 | http://stardrive.genesismuds.com/index.php/ | 1.4.0RC1
-| https://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101 | ??
-| https://www.geroedel.de/wiki/ | 1.4.0
+| https://storage.ct.infn.it/ | 1.3.10
+| http://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101 | ??
 | http://utenmelk.no/wiki/ | 1.4.0RC1
-| http://wac-tk.drni.de/ | 1.3.11p1
-| http://wiki.cyberleo.net/ | 1.4.0RC1
+| http://wac-tk.drni.de | 1.3.11p1
+| http://wiki.cyberleo.net | 1.4.0RC1
 | http://wiki.inde-mayenne.org | 1.3.14
 | http://wiki.prideindustries.com | 1.4.0RC1
+| http://wiki.rheelweb.co.nz | 1.3.12p3
 | http://www.allpsych.uni-giessen.de/wikidump/HomePage.html | ??
 | http://www-bd.lip6.fr/ens/li345-2011/index.php/Accueil | 1.4.0RC1
+| http://www.calt.insead.edu/LivingLab/AtGentive/Wiki/ | 1.3.14
 | http://www.dkbush.com/zphpwiki/ | 1.3.14
 | http://www.drtedwilliams.net/kb/ | 1.3.14
 | http://www.e38.org/phpwiki/ | 1.3.14
-| http://www.hollenback.net/ | 1.4.0RC1
+| http://www.geroedel.de/wiki/ | 1.4.0
+| http://www.hollenback.net | 1.4.0RC1
+| http://www.kcpralumni.org/wiki/ | 1.5.4
+| http://www.main.org/fcc/ | 1.3.4pre
 | http://www.michelsystems.com/phpwiki/ | 1.4.0RC1
-| http://www.personalwelt.org/ | 1.4.0RC1
+| http://www.mtjezreel.com/phpwiki/ | 1.3.14
+| http://www.personalwelt.org | 1.4.0RC1
 | http://www.the-bees-knees.info/phpwiki/ | 1.5.4
 | http://www.toledoans.us/dart/index.php/HomePage | ??
-| http://www.wendellregenerative.info/index.php/HomePage |
+| http://www.wendellregenerative.info/index.php/HomePage | ??
+| http://www.wmsforums.com/wiki/ | 1.3.14
+| http://xulfr.org/wiki/ | ??
 | http://zombiecouncil.com/zwiki/ | 1.4.0RC1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9771
 http://sourceforge.net/p/phpwiki/code/9771
Author: vargenau
Date: 2016年01月27日 16:55:18 +0000 (2016年1月27日)
Log Message:
-----------
Update Help/WikisUsingPhpWiki
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWikisUsingPhpWiki
Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016年01月22日 17:30:19 UTC (rev 9770)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016年01月27日 16:55:18 UTC (rev 9771)
@@ -1,4 +1,4 @@
-Date: 2016年1月22日 18:29:43 +0000
+Date: 2016年1月27日 17:53:58 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWikisUsingPhpWiki
@@ -8,37 +8,50 @@
 
 Here are some wikis using ~PhpWiki:
 
-|= URL |= ~PhpWiki release
-| http://bayernprovider.info/ | 1.4.0RC1
-| http://bh.hallikainen.org/ | 1.5.4
-| http://crdo.up.univ-aix.fr/phpwiki/ | 1.3.14
-| http://danm.ucsc.edu/web/ | 1.3.14
-| http://dev.cmeerw.org/HomePage | 1.5.5
-| http://esk.uz | 1.3.14
-| http://www.hollenback.net/ | 1.4.0RC1
-| http://helpdesk.razorline.com/wiki/ | 1.4.0RC1
-| http://ifellner.de/ingowiki/ | 1.4.0RC1
-| http://iwant2know.net/singaporewiki/ | 1.4.0RC1
-| http://logix.me/wiki/ | 1.4.0RC1
-| http://mtswiki.westwood-tech.com/mtswiki-index.php | 1.4.0RC1
-| http://nextdoordiscount.com/nydba/ | 1.4.0RC1
-| http://pcsgwiki.com/wiki/ | 1.3.14
-| http://www.personalwelt.org/ | 1.4.0RC1
-| http://php-rql.dnsalias.net/wiki/ | 1.4.0RC1
-| http://profit.colegiolasalleguaparo.edu.ve/wiki/ | 1.3.14
-| http://rec-puzzles.org/ | 1.3.11p1
-| http://rhythsmbox.com/wiki/index.php | 1.4.0RC1
-| http://sldr-test.lpl-aix.fr/phpwiki/ | 1.3.14
-| https://open-innovation.alcatel-lucent.com/wiki/g/help/ | 1.3.14
-| http://stardrive.genesismuds.com/index.php/ | 1.4.0RC1
-| https://www.geroedel.de/wiki/ | 1.4.0
-| http://utenmelk.no/wiki/ | 1.4.0RC1
-| http://wac-tk.drni.de/ | 1.3.11p1
-| http://wiki.cyberleo.net/ | 1.4.0RC1
-| http://wiki.inde-mayenne.org | 1.3.14
-| http://www-bd.lip6.fr/ens/li345-2011/index.php/Accueil | 1.4.0RC1
-| http://www.dkbush.com/zphpwiki/ | 1.3.14
-| http://www.drtedwilliams.net/kb/ | 1.3.14
-| http://www.e38.org/phpwiki/ | 1.3.14
-| http://www.michelsystems.com/phpwiki/ | 1.4.0RC1
-| http://zombiecouncil.com/zwiki/ | 1.4.0RC1
+|= URL |= ~PhpWiki release
+| http://alsach.at/phpwiki/ | 1.4.0RC1
+| http://bayernprovider.info | 1.4.0RC1
+| http://bh.hallikainen.org | 1.5.4
+| http://brainyplanet.com | 1.3.11p1
+| http://crdo.up.univ-aix.fr/phpwiki/ | 1.3.14
+| http://danm.ucsc.edu/web/ | 1.3.14
+| http://dev.cmeerw.org/HomePage | 1.5.5
+| http://drtedwilliams.net/kb/ | 1.3.14
+| http://esk.uz | 1.3.14
+| http://helpdesk.razorline.com/wiki/ | 1.4.0RC1
+| http://ifellner.de/ingowiki/ | 1.4.0RC1
+| http://indiainvestments.awardspace.com | 1.3.12p2
+| http://iwant2know.net/singaporewiki/ | 1.4.0RC1
+| http://logix.me/wiki/ | 1.4.0RC1
+| http://meanwhile.sourceforge.net/wiki/ | 1.4.0RC1
+| http://mtswiki.westwood-tech.com/mtswiki-index.php | 1.4.0RC1
+| http://neckbeard.us/HomePage | 1.5.4
+| http://nextdoordiscount.com/nydba/ | 1.4.0RC1
+| http://ohg82er.de/wiki/index.php/StartSeite | 1.3.2-jeffs-hacks
+| http://pcsgwiki.com/wiki/ | 1.3.14
+| http://php-rql.dnsalias.net/wiki/ | 1.4.0RC1
+| http://profit.colegiolasalleguaparo.edu.ve/wiki/ | 1.3.14
+| http://rec-puzzles.org | 1.3.11p1
+| http://rhythsmbox.com/wiki/index.php | 1.4.0RC1
+| http://sldr-test.lpl-aix.fr/phpwiki/ | 1.3.14
+| https://open-innovation.alcatel-lucent.com/wiki/g/help/ | 1.3.14
+| http://stardrive.genesismuds.com/index.php/ | 1.4.0RC1
+| https://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101 | ??
+| https://www.geroedel.de/wiki/ | 1.4.0
+| http://utenmelk.no/wiki/ | 1.4.0RC1
+| http://wac-tk.drni.de/ | 1.3.11p1
+| http://wiki.cyberleo.net/ | 1.4.0RC1
+| http://wiki.inde-mayenne.org | 1.3.14
+| http://wiki.prideindustries.com | 1.4.0RC1
+| http://www.allpsych.uni-giessen.de/wikidump/HomePage.html | ??
+| http://www-bd.lip6.fr/ens/li345-2011/index.php/Accueil | 1.4.0RC1
+| http://www.dkbush.com/zphpwiki/ | 1.3.14
+| http://www.drtedwilliams.net/kb/ | 1.3.14
+| http://www.e38.org/phpwiki/ | 1.3.14
+| http://www.hollenback.net/ | 1.4.0RC1
+| http://www.michelsystems.com/phpwiki/ | 1.4.0RC1
+| http://www.personalwelt.org/ | 1.4.0RC1
+| http://www.the-bees-knees.info/phpwiki/ | 1.5.4
+| http://www.toledoans.us/dart/index.php/HomePage | ??
+| http://www.wendellregenerative.info/index.php/HomePage |
+| http://zombiecouncil.com/zwiki/ | 1.4.0RC1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9770
 http://sourceforge.net/p/phpwiki/code/9770
Author: vargenau
Date: 2016年01月22日 17:30:19 +0000 (2016年1月22日)
Log Message:
-----------
http://bh.hallikainen.org/ 1.5.4
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWikisUsingPhpWiki
Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016年01月22日 17:23:31 UTC (rev 9769)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016年01月22日 17:30:19 UTC (rev 9770)
@@ -1,4 +1,4 @@
-Date: 2016年1月22日 18:21:46 +0000
+Date: 2016年1月22日 18:29:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWikisUsingPhpWiki
@@ -10,7 +10,7 @@
 
 |= URL |= ~PhpWiki release
 | http://bayernprovider.info/ | 1.4.0RC1
-| http://bh.hallikainen.org/ | 1.4.0
+| http://bh.hallikainen.org/ | 1.5.4
 | http://crdo.up.univ-aix.fr/phpwiki/ | 1.3.14
 | http://danm.ucsc.edu/web/ | 1.3.14
 | http://dev.cmeerw.org/HomePage | 1.5.5
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9769
 http://sourceforge.net/p/phpwiki/code/9769
Author: vargenau
Date: 2016年01月22日 17:23:31 +0000 (2016年1月22日)
Log Message:
-----------
http://dev.cmeerw.org/HomePage: 1.5.5
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWikisUsingPhpWiki
Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016年01月22日 17:06:38 UTC (rev 9768)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016年01月22日 17:23:31 UTC (rev 9769)
@@ -1,4 +1,4 @@
-Date: 2015年12月10日 18:48:03 +0000
+Date: 2016年1月22日 18:21:46 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWikisUsingPhpWiki
@@ -13,7 +13,7 @@
 | http://bh.hallikainen.org/ | 1.4.0
 | http://crdo.up.univ-aix.fr/phpwiki/ | 1.3.14
 | http://danm.ucsc.edu/web/ | 1.3.14
-| http://dev.cmeerw.org/HomePage | 1.5.4
+| http://dev.cmeerw.org/HomePage | 1.5.5
 | http://esk.uz | 1.3.14
 | http://www.hollenback.net/ | 1.4.0RC1
 | http://helpdesk.razorline.com/wiki/ | 1.4.0RC1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9768
 http://sourceforge.net/p/phpwiki/code/9768
Author: vargenau
Date: 2016年01月22日 17:06:38 +0000 (2016年1月22日)
Log Message:
-----------
Remove unused arguments
Modified Paths:
--------------
 trunk/lib/plugin/IncludePage.php
 trunk/lib/stdlib.php
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2016年01月22日 17:04:02 UTC (rev 9767)
+++ trunk/lib/plugin/IncludePage.php	2016年01月22日 17:06:38 UTC (rev 9768)
@@ -201,7 +201,7 @@
 }
 }
 if ($sections) {
- $c = extractSections($sections, $c, $pagename, $quiet, 1);
+ $c = extractSections($sections, $c);
 }
 if ($lines) {
 $c = array_slice($c, 0, $lines);
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016年01月22日 17:04:02 UTC (rev 9767)
+++ trunk/lib/stdlib.php	2016年01月22日 17:06:38 UTC (rev 9768)
@@ -1821,7 +1821,7 @@
 }
 
 // Extract the first $sections sections of the page
-function extractSections($sections, $content, $page, $quiet = false, $sectionhead = false)
+function extractSections($sections, $content)
 {
 
 $mycontent = $content;
@@ -1839,8 +1839,7 @@
 $section = $match[2];
 // Strip trailing blanks lines and ---- <hr>s
 $text = preg_replace("/\\s*^-{4,}\\s*$/m", "", $match[3]);
- if ($sectionhead)
- $text = $match[1] . $section . "\n" . $text;
+ $text = $match[1] . $section . "\n" . $text;
 $result .= $text;
 
 $mycontent = explode("\n", $match[4]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9767
 http://sourceforge.net/p/phpwiki/code/9767
Author: vargenau
Date: 2016年01月22日 17:04:02 +0000 (2016年1月22日)
Log Message:
-----------
Comments only
Modified Paths:
--------------
 trunk/lib/plugin/UnfoldSubpages.php
Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2016年01月18日 10:17:01 UTC (rev 9766)
+++ trunk/lib/plugin/UnfoldSubpages.php	2016年01月22日 17:04:02 UTC (rev 9767)
@@ -48,23 +48,17 @@
 PageList::supportedArgs(),
 array(
 'pagename' => '[pagename]', // default: current page
- //'header' => '', // expandable string
 'quiet' => false, // print no header
 'sortby' => '', // [+|-]pagename, [+|-]mtime, [+|-]hits
 'maxpages' => false, // maximum number of pages to include (== limit)
- 'smalltitle' => false, // if set, hide transclusion-title,
- // just have a small link at the start of
- // the page.
- 'words' => false, // maximum number of words
- // per page to include
- 'lines' => false, // maximum number of lines
- // per page to include
- 'bytes' => false, // maximum number of bytes
- // per page to include
+ 'smalltitle' => false, // if set, hide transclusion-title,
+ // just have a small link at the start of the page.
+ 'words' => false, // maximum number of words per page to include
+ 'lines' => false, // maximum number of lines per page to include
+ 'bytes' => false, // maximum number of bytes per page to include
 'sections' => false, // maximum number of sections per page to include
 'section' => false, // this named section per page only
- 'sectionhead' => false // when including a named
- // section show the heading
+ 'sectionhead' => false // when including a named section show the heading
 ));
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9766
 http://sourceforge.net/p/phpwiki/code/9766
Author: vargenau
Date: 2016年01月18日 10:17:01 +0000 (2016年1月18日)
Log Message:
-----------
Replace Alcatel-Lucent violet by blue
Modified Paths:
--------------
 trunk/themes/MonoBook/monobook.css
 trunk/themes/Sidebar/sidebar.css
 trunk/themes/fusionforge/fusionforge.css
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2016年01月18日 10:07:54 UTC (rev 9765)
+++ trunk/themes/MonoBook/monobook.css	2016年01月18日 10:17:01 UTC (rev 9766)
@@ -2179,7 +2179,7 @@
 
 td.tdselected {
 color: white;
- background-color: #554295;
+ background-color: #124191;
 }
 
 td.tdunselected {
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2016年01月18日 10:07:54 UTC (rev 9765)
+++ trunk/themes/Sidebar/sidebar.css	2016年01月18日 10:17:01 UTC (rev 9766)
@@ -2289,7 +2289,7 @@
 
 td.tdselected {
 color: white;
- background-color: #554295;
+ background-color: #124191;
 }
 
 td.tdunselected {
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2016年01月18日 10:07:54 UTC (rev 9765)
+++ trunk/themes/fusionforge/fusionforge.css	2016年01月18日 10:17:01 UTC (rev 9766)
@@ -93,7 +93,7 @@
 padding-bottom: 6px;
 vertical-align: middle;
 font-family: 'trebuchet MS', Arial, Helvetica, sans-serif;
- color: #554295; /* Alcatel-Lucent violet */
+ color: #124191;
 font-weight: normal;
 font-size: 1.8em;
 line-height: 1.3em;
@@ -104,7 +104,7 @@
 
 /* Hack for the wiki that inserts an unneccessary </p> */
 .titlebar p {
- color: #554295; /* Alcatel-Lucent violet */
+ color: #124191;
 font-size: 1em;
 margin-bottom: 0;
 margin-top: 0;
@@ -1293,7 +1293,7 @@
 
 td.tdselected {
 color: white;
- background-color: #554295;
+ background-color: #124191;
 }
 
 td.tdunselected {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9765
 http://sourceforge.net/p/phpwiki/code/9765
Author: vargenau
Date: 2016年01月18日 10:07:54 +0000 (2016年1月18日)
Log Message:
-----------
Update ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016年01月18日 10:06:52 UTC (rev 9764)
+++ trunk/pgsrc/ReleaseNotes	2016年01月18日 10:07:54 UTC (rev 9765)
@@ -1,4 +1,4 @@
-Date: Thu, 7 Jan 2016 10:17:20 +0000
+Date: 2016年1月18日 10:18:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -8,6 +8,10 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
+== 1.5.6 2016-XX-XX Marc-Etienne Vargenau ==
+
+* Upload plugin: put date and author in history
+
 == 1.5.5 2015年12月11日 Marc-Etienne Vargenau ==
 
 * Fix tooltip translation in ~CreateToc plugin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9764
 http://sourceforge.net/p/phpwiki/code/9764
Author: vargenau
Date: 2016年01月18日 10:06:52 +0000 (2016年1月18日)
Log Message:
-----------
UpLoad plugin: remove unused parameter in function log
Modified Paths:
--------------
 trunk/lib/plugin/UpLoad.php
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016年01月16日 16:28:16 UTC (rev 9763)
+++ trunk/lib/plugin/UpLoad.php	2016年01月18日 10:06:52 UTC (rev 9764)
@@ -206,7 +206,7 @@
 // the upload was a success and we need to mark this event in the "upload log"
 if ($logfile) {
 $upload_log = $file_dir . basename($logfile);
- $this->log($userfile, $upload_log, $message);
+ $this->log($userfile, $upload_log);
 }
 if ($autolink) {
 require_once 'lib/loadsave.php';
@@ -241,7 +241,7 @@
 return HTML($message, $form);
 }
 
- private function log($userfile, $upload_log, &$message)
+ private function log($userfile, $upload_log)
 {
 global $WikiTheme;
 /**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9763
 http://sourceforge.net/p/phpwiki/code/9763
Author: vargenau
Date: 2016年01月16日 16:28:16 +0000 (2016年1月16日)
Log Message:
-----------
Upload plugin: put date and author in history
Modified Paths:
--------------
 trunk/lib/plugin/UpLoad.php
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016年01月11日 20:10:12 UTC (rev 9762)
+++ trunk/lib/plugin/UpLoad.php	2016年01月16日 16:28:16 UTC (rev 9763)
@@ -227,6 +227,8 @@
 } else {
 $meta['summary'] = sprintf(_("uploaded %s"), $sanified_userfile_name);
 }
+ $meta['mtime'] = time();
+ $meta['author'] = $request->getUser()->getId();
 $pagehandle->save($newtext, $version + 1, $meta);
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9762
 http://sourceforge.net/p/phpwiki/code/9762
Author: vargenau
Date: 2016年01月11日 20:10:12 +0000 (2016年1月11日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/SemanticWeb.php
 trunk/lib/TextSearchQuery.php
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2016年01月07日 17:53:40 UTC (rev 9761)
+++ trunk/lib/SemanticWeb.php	2016年01月11日 20:10:12 UTC (rev 9762)
@@ -285,20 +285,13 @@
 class SemanticAttributeSearchQuery
 extends NumericSearchQuery
 {
- /*
- public $base_units = array('m' => explode(',','km,miles,cm,dm,mm,ft,inch,inches,meter'),
- 'm^2' => explode(',','km^2,ha,cm^2,mi^2'),
- 'm^3' => explode(',','km^3,lit,cm^3,dm^3,gallons'),
- );
- */
-
 /**
 * We need to detect units from the freetext query:
 * population > 1 million
 */
 function __construct($search_query, $placeholders, $unit = '')
 {
- $this->NumericSearchQuery($search_query, $placeholders);
+ parent::__construct($search_query, $placeholders);
 $this->_units = new Units();
 $this->unit = $unit;
 }
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2016年01月07日 17:53:40 UTC (rev 9761)
+++ trunk/lib/TextSearchQuery.php	2016年01月11日 20:10:12 UTC (rev 9762)
@@ -367,7 +367,7 @@
 * @param $placeholders array or string All placeholders in the query must be defined
 * here, and will be replaced by the matcher.
 */
- public function NumericSearchQuery($search_query, $placeholders)
+ function __construct($search_query, $placeholders)
 {
 // added some basic security checks against user input
 $this->_query = $search_query;
@@ -802,7 +802,7 @@
 public $op = "NOT";
 public $_op = TSQ_TOK_NOT;
 
- function TextSearchQuery_node_not($leaf)
+ function __construct($leaf)
 {
 $this->leaves = array($leaf);
 }
@@ -1141,8 +1141,7 @@
 
 class TextSearchQuery_Lexer
 {
- function TextSearchQuery_Lexer($query_str, $case_exact = false,
- $regex = TSQ_REGEX_AUTO)
+ function __construct($query_str, $case_exact = false, $regex = TSQ_REGEX_AUTO)
 {
 $this->tokens = $this->tokenize($query_str, $case_exact, $regex);
 $this->query_str = $query_str;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9761
 http://sourceforge.net/p/phpwiki/code/9761
Author: vargenau
Date: 2016年01月07日 17:53:40 +0000 (2016年1月07日)
Log Message:
-----------
Use CSS
Modified Paths:
--------------
 trunk/lib/PagePerm.php
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2016年01月07日 09:54:54 UTC (rev 9760)
+++ trunk/lib/PagePerm.php	2016年01月07日 17:53:40 UTC (rev 9761)
@@ -584,7 +584,7 @@
 foreach ($this->perm as $access => $perms) {
 $td = HTML::table(array('class' => 'cal'));
 foreach ($perms as $group => $bool) {
- $td->pushContent(HTML::tr(HTML::td(array('align' => 'right'), $group),
+ $td->pushContent(HTML::tr(HTML::td(array('class' => 'align-right'), $group),
 HTML::td($bool ? '[X]' : '[ ]')));
 }
 $table->pushContent(HTML::tr(array('class' => 'top'),
@@ -612,9 +612,9 @@
 }
 $table = HTML::table();
 $table->pushContent(HTML::tr(
- HTML::th(array('align' => 'left'),
+ HTML::th(array('class' => 'align-left'),
 _("Access")),
- HTML::th(array('align' => 'right'),
+ HTML::th(array('class' => 'align-right'),
 _("Group/User")),
 HTML::th(_("Grant")),
 HTML::th(_("Del/+")),
@@ -681,30 +681,30 @@
 $table->pushContent(
 HTML::tr(
 HTML::td(HTML::strong($access . ":")),
- HTML::td(array('class' => 'cal-today', 'align' => 'right'),
+ HTML::td(array('class' => 'cal-today align-right'),
 HTML::strong($this->groupName($group))),
- HTML::td(array('align' => 'center'), $nbsp, $checkbox),
- HTML::td(array('align' => 'right', 'style' => 'background: #aaa url(' . $deletesrc . ') no-repeat'), $deletebutton),
+ HTML::td(array('class' => 'align-center'), $nbsp, $checkbox),
+ HTML::td(array('class' => 'align-right', 'style' => 'background: #aaa url(' . $deletesrc . ') no-repeat'), $deletebutton),
 HTML::td(HTML::em(getAccessDescription($access)))));
 $first_only = false;
 } else {
 $table->pushContent(
 HTML::tr(
 HTML::td(),
- HTML::td(array('class' => 'cal-today', 'align' => 'right'),
+ HTML::td(array('class' => 'cal-today align-right'),
 HTML::strong($this->groupName($group))),
- HTML::td(array('align' => 'center'), $nbsp, $checkbox),
- HTML::td(array('align' => 'right', 'style' => 'background: #aaa url(' . $deletesrc . ') no-repeat'), $deletebutton),
+ HTML::td(array('class' => 'align-center'), $nbsp, $checkbox),
+ HTML::td(array('class' => 'align-right', 'style' => 'background: #aaa url(' . $deletesrc . ') no-repeat'), $deletebutton),
 HTML::td()));
 }
 }
 if (!empty($groups))
 $table->pushContent(
 HTML::tr(array('class' => 'top'),
- HTML::td(array('align' => 'right'), _("add ")),
+ HTML::td(array('class' => 'align-right'), _("add ")),
 HTML::td($newgroup),
- HTML::td(array('align' => 'center'), $nbsp, $newperm),
- HTML::td(array('align' => 'right', 'style' => 'background: #ccc url(' . $addsrc . ') no-repeat'), $addbutton),
+ HTML::td(array('class' => 'align-center'), $nbsp, $newperm),
+ HTML::td(array('class' => 'align-right', 'style' => 'background: #ccc url(' . $addsrc . ') no-repeat'), $addbutton),
 HTML::td(HTML::small(_("Check to add this ACL")))));
 }
 if ($type == 'default')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9760
 http://sourceforge.net/p/phpwiki/code/9760
Author: vargenau
Date: 2016年01月07日 09:54:54 +0000 (2016年1月07日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/PagePerm.php
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2016年01月07日 09:46:33 UTC (rev 9759)
+++ trunk/lib/PagePerm.php	2016年01月07日 09:54:54 UTC (rev 9760)
@@ -357,7 +357,7 @@
 {
 public $perm;
 
- function PagePermission($hash = array())
+ function __construct($hash = array())
 {
 /**
 * @var WikiRequest $request
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9759
 http://sourceforge.net/p/phpwiki/code/9759
Author: vargenau
Date: 2016年01月07日 09:46:33 +0000 (2016年1月07日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/WikiGroup.php
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2016年01月07日 09:38:20 UTC (rev 9758)
+++ trunk/lib/WikiGroup.php	2016年01月07日 09:46:33 UTC (rev 9759)
@@ -62,8 +62,6 @@
 public $username = '';
 /** User object if different from current user */
 public $user;
- /** The global WikiRequest object */
- //public $request;
 /** Array of groups $username is confirmed to belong to */
 public $membership;
 /** boolean if not the current user */
@@ -74,7 +72,7 @@
 * $group = &WikiGroup::getGroup();
 * @param bool $not_current
 */
- function WikiGroup($not_current = false)
+ function __construct($not_current = false)
 {
 $this->not_current = $not_current;
 }
@@ -871,8 +869,6 @@
 */
 function isMember($group)
 {
- //$request = $this->request;
- //$username = $this->username;
 if (isset($this->membership[$group])) {
 return $this->membership[$group];
 }
@@ -988,8 +984,6 @@
 if (isset($this->membership[$group])) {
 return $this->membership[$group];
 }
- //$request = $this->request;
- //$username = $this->_getUserName();
 $this->membership[$group] = in_array($this->username, $this->getMembersOf($group));
 if ($this->membership[$group])
 return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9758
 http://sourceforge.net/p/phpwiki/code/9758
Author: vargenau
Date: 2016年01月07日 09:38:20 +0000 (2016年1月07日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/WikiUser.php
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016年01月07日 09:32:29 UTC (rev 9757)
+++ trunk/lib/WikiUser.php	2016年01月07日 09:38:20 UTC (rev 9758)
@@ -353,10 +353,8 @@
 public $_current_method;
 public $_current_index;
 
- // constructor
- function _WikiUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
-
 $this->_userid = $UserName;
 $this->_HomePagehandle = false;
 if ($UserName) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9757
 http://sourceforge.net/p/phpwiki/code/9757
Author: vargenau
Date: 2016年01月07日 09:32:29 +0000 (2016年1月07日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/XmlElement.php
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2016年01月07日 09:26:41 UTC (rev 9756)
+++ trunk/lib/XmlElement.php	2016年01月07日 09:32:29 UTC (rev 9757)
@@ -461,7 +461,7 @@
 
 class RawXml
 {
- function RawXml($xml_text)
+ function __construct($xml_text)
 {
 $this->_xml = $xml_text;
 }
@@ -498,7 +498,7 @@
 public $_fs;
 public $_args;
 
- function FormattedText($fs /* , ... */)
+ function __construct($fs /* , ... */)
 {
 if ($fs !== false) {
 $this->_init(func_get_args());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9756
 http://sourceforge.net/p/phpwiki/code/9756
Author: vargenau
Date: 2016年01月07日 09:26:41 +0000 (2016年1月07日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/prepend.php
Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2016年01月07日 09:25:29 UTC (rev 9755)
+++ trunk/lib/prepend.php	2016年01月07日 09:26:41 UTC (rev 9756)
@@ -46,7 +46,7 @@
 // Used for debugging purposes
 class DebugTimer
 {
- function DebugTimer()
+ function __construct()
 {
 $this->_start = $this->microtime();
 // Function 'posix_times' does not exist on Windows
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9755
 http://sourceforge.net/p/phpwiki/code/9755
Author: vargenau
Date: 2016年01月07日 09:25:29 +0000 (2016年1月07日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/WikiDB/backend.php
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2016年01月07日 09:21:44 UTC (rev 9754)
+++ trunk/lib/WikiDB/backend.php	2016年01月07日 09:25:29 UTC (rev 9755)
@@ -776,7 +776,7 @@
 */
 class WikiDB_backend_search
 {
- function WikiDB_backend_search($search, &$dbh)
+ function __construct($search, &$dbh)
 {
 $this->_dbh = $dbh;
 $this->_case_exact = $search->_case_exact;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9754
 http://sourceforge.net/p/phpwiki/code/9754
Author: vargenau
Date: 2016年01月07日 09:21:44 +0000 (2016年1月07日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/CachedMarkup.php
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2016年01月07日 09:17:38 UTC (rev 9753)
+++ trunk/lib/CachedMarkup.php	2016年01月07日 09:21:44 UTC (rev 9754)
@@ -256,7 +256,7 @@
 
 class XmlRpc_LinkInfo
 {
- function XmlRpc_LinkInfo($page, $type, $href, $relation = '')
+ function __construct($page, $type, $href, $relation = '')
 {
 $this->page = $page;
 $this->type = $type;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9753
 http://sourceforge.net/p/phpwiki/code/9753
Author: vargenau
Date: 2016年01月07日 09:17:38 +0000 (2016年1月07日)
Log Message:
-----------
Update ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016年01月07日 09:14:44 UTC (rev 9752)
+++ trunk/pgsrc/ReleaseNotes	2016年01月07日 09:17:38 UTC (rev 9753)
@@ -1,4 +1,4 @@
-Date: Thu, 7 Jan 2016 10:11:43 +0000
+Date: Thu, 7 Jan 2016 10:17:20 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -16,7 +16,7 @@
 * Fix fatal database error with multiple comma-delimited sortby args
 * Remove forbidden characters: ~<~>~[~]~{~}~"~|~# from pagename
 * New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.
-* Upload: replace multiple spaces by single space
+* Upload~: replace multiple spaces by single space
 * Make functions merged and is_conflict public in lib/diff3.php (support request #162)
 
 == 1.5.4 2015年06月29日 Marc-Etienne Vargenau ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9752
 http://sourceforge.net/p/phpwiki/code/9752
Author: vargenau
Date: 2016年01月07日 09:14:44 +0000 (2016年1月07日)
Log Message:
-----------
Update ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016年01月06日 17:45:14 UTC (rev 9751)
+++ trunk/pgsrc/ReleaseNotes	2016年01月07日 09:14:44 UTC (rev 9752)
@@ -1,4 +1,4 @@
-Date: 2015年12月11日 10:53:47 +0000
+Date: Thu, 7 Jan 2016 10:11:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -29,7 +29,7 @@
 * New icons in Edit Toolbar
 * Make static templates in Edit Toolbar work
 * Fix memory_limit for WIKI_SOAP
-* Remove MockRequest
+* Remove ~MockRequest
 * Update jquery to 1.11.3
 
 == 1.5.3 2015年03月04日 Marc-Etienne Vargenau ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9751
 http://sourceforge.net/p/phpwiki/code/9751
Author: vargenau
Date: 2016年01月06日 17:45:14 +0000 (2016年1月06日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/WikiUser/AdoDb.php
 trunk/lib/WikiUser/Db.php
 trunk/lib/WikiUser/File.php
 trunk/lib/WikiUser/FusionForge.php
 trunk/lib/WikiUser/HttpAuth.php
 trunk/lib/WikiUser/HttpAuthUpper.php
 trunk/lib/WikiUser/PdoDb.php
 trunk/lib/WikiUser/PearDb.php
 trunk/lib/WikiUser/Session.php
 trunk/lib/WikiUser.php
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/AdoDb.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -38,7 +38,7 @@
 {
 public $_authmethod = 'AdoDb';
 
- function _AdoDbPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 /**
 * @var WikiRequest $request
@@ -48,7 +48,7 @@
 if (!$this->_prefs and is_a($this, "_AdoDbPassUser")) {
 if ($prefs) $this->_prefs = $prefs;
 if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ _PassUser::__construct($UserName);
 }
 if (!$this->isValidName($UserName)) {
 trigger_error(_("Invalid username."), E_USER_WARNING);
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/Db.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -49,7 +49,7 @@
 
 // This can only be called from _PassUser, because the parent class
 // sets the auth_dbi and pref methods, before this class is initialized.
- function _DbPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 /**
 * @var WikiRequest $request
@@ -60,7 +60,7 @@
 if ($prefs) $this->_prefs = $prefs;
 }
 if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
 elseif (!$this->isValidName($UserName)) {
 trigger_error(_("Invalid username."), E_USER_WARNING);
 return false;
Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/File.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -33,12 +33,12 @@
 
 // This can only be called from _PassUser, because the parent class
 // sets the pref methods, before this class is initialized.
- function _FilePassUser($UserName = '', $prefs = false, $file = '')
+ function __construct($UserName = '', $prefs = false, $file = '')
 {
 if (!$this->_prefs and is_a($this, "_FilePassUser")) {
 if ($prefs) $this->_prefs = $prefs;
 if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
 }
 $this->_userid = $UserName;
 // read the .htaccess style file. We use our own copy of the standard pear class.
Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/FusionForge.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -28,11 +28,11 @@
 
 public $_is_external = 0;
 
- function _FusionForgePassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 if ($prefs) $this->_prefs = $prefs;
 if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
 if ($UserName) $this->_userid = $UserName;
 $this->_authmethod = 'FusionForge';
 
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/HttpAuth.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -35,11 +35,11 @@
 class _HttpAuthPassUser
 extends _PassUser
 {
- function _HttpAuthPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 if ($prefs) $this->_prefs = $prefs;
 if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
 if ($UserName) $this->_userid = $UserName;
 $this->_authmethod = 'HttpAuth';
 
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/HttpAuthUpper.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -36,11 +36,11 @@
 class _HttpAuthUpperPassUser
 extends _PassUser
 {
- function _HttpAuthUpperPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 if ($prefs) $this->_prefs = $prefs;
 if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
 if ($UserName)
 $this->_userid = $UserName;
 $this->_authmethod = 'HttpAuthUpper';
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/PdoDb.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -35,7 +35,7 @@
 {
 public $_authmethod = 'PDODb';
 
- function _PdoDbPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 /**
 * @var WikiRequest $request
@@ -46,7 +46,7 @@
 if ($prefs) $this->_prefs = $prefs;
 }
 if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ _PassUser::__construct($UserName);
 elseif (!$this->isValidName($UserName)) {
 trigger_error(_("Invalid username."), E_USER_WARNING);
 return false;
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/PearDb.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -33,7 +33,7 @@
 {
 public $_authmethod = 'PearDb';
 
- function _PearDbPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 /**
 * @var WikiRequest $request
@@ -46,7 +46,7 @@
 }
 }
 if (!isset($this->_prefs->_method)) {
- _PassUser::_PassUser($UserName);
+ _PassUser::__construct($UserName);
 } elseif (!$this->isValidName($UserName)) {
 trigger_error(_("Invalid username."), E_USER_WARNING);
 return false;
Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/Session.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -30,7 +30,7 @@
 class _SessionPassUser
 extends _PassUser
 {
- function _SessionPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 if ($prefs) $this->_prefs = $prefs;
 if (!defined("AUTH_SESS_USER") or !defined("AUTH_SESS_LEVEL")) {
@@ -57,7 +57,7 @@
 $this->_userid = $sess[AUTH_SESS_USER];
 }
 if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($this->_userid);
+ parent::__construct($this->_userid);
 $this->_level = AUTH_SESS_LEVEL;
 $this->_authmethod = 'Session';
 }
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016年01月06日 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser.php	2016年01月06日 17:45:14 UTC (rev 9751)
@@ -925,7 +925,7 @@
 public $_current_index;
 
 // check and prepare the auth and pref methods only once
- function _PassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
 {
 /**
 * @var WikiRequest $request
@@ -1480,7 +1480,7 @@
 {
 public $default_value;
 
- function _UserPreference($default_value)
+ function __construct($default_value)
 {
 $this->default_value = $default_value;
 }
@@ -1534,10 +1534,9 @@
 class _UserPreference_numeric
 extends _UserPreference
 {
- function _UserPreference_numeric($default, $minval = false,
- $maxval = false)
+ function __construct($default, $minval = false, $maxval = false)
 {
- $this->_UserPreference((double)$default);
+ parent::__construct((double)$default);
 $this->_minval = (double)$minval;
 $this->_maxval = (double)$maxval;
 }
@@ -1556,9 +1555,9 @@
 class _UserPreference_int
 extends _UserPreference_numeric
 {
- function _UserPreference_int($default, $minval = false, $maxval = false)
+ function __construct($default, $minval = false, $maxval = false)
 {
- $this->_UserPreference_numeric((int)$default, (int)$minval, (int)$maxval);
+ parent::__construct((int)$default, (int)$minval, (int)$maxval);
 }
 
 function sanify($value)
@@ -1570,9 +1569,9 @@
 class _UserPreference_bool
 extends _UserPreference
 {
- function _UserPreference_bool($default = false)
+ function __construct($default = false)
 {
- $this->_UserPreference((bool)$default);
+ parent::__construct((bool)$default);
 }
 
 function sanify($value)
@@ -1600,9 +1599,9 @@
 class _UserPreference_language
 extends _UserPreference
 {
- function _UserPreference_language($default = DEFAULT_LANGUAGE)
+ function __construct($default = DEFAULT_LANGUAGE)
 {
- $this->_UserPreference($default);
+ parent::__construct($default);
 }
 
 // FIXME: check for valid locale
@@ -1634,9 +1633,9 @@
 class _UserPreference_theme
 extends _UserPreference
 {
- function _UserPreference_theme($default = THEME)
+ function __construct($default = THEME)
 {
- $this->_UserPreference($default);
+ parent::__construct($default);
 }
 
 function sanify($value)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9750
 http://sourceforge.net/p/phpwiki/code/9750
Author: vargenau
Date: 2016年01月06日 09:28:54 +0000 (2016年1月06日)
Log Message:
-----------
make depend
Modified Paths:
--------------
 trunk/locale/Makefile
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2016年01月05日 20:53:59 UTC (rev 9749)
+++ trunk/locale/Makefile	2016年01月06日 09:28:54 UTC (rev 9750)
@@ -152,7 +152,6 @@
 ${POT_FILE}: .././lib/pear/DB/sybase.php
 ${POT_FILE}: .././lib/pear/File_Passwd.php
 ${POT_FILE}: .././lib/pear/JSON.php
-${POT_FILE}: .././lib/pear/PEAR5.php
 ${POT_FILE}: .././lib/pear/PEAR.php
 ${POT_FILE}: .././lib/plugin/AddComment.php
 ${POT_FILE}: .././lib/plugin/AllPages.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9749
 http://sourceforge.net/p/phpwiki/code/9749
Author: vargenau
Date: 2016年01月05日 20:53:59 +0000 (2016年1月05日)
Log Message:
-----------
Update PEAR.php to release 1.10.1
Modified Paths:
--------------
 trunk/lib/pear/PEAR.php
Removed Paths:
-------------
 trunk/lib/pear/PEAR5.php
Modified: trunk/lib/pear/PEAR.php
===================================================================
--- trunk/lib/pear/PEAR.php	2016年01月05日 20:16:20 UTC (rev 9748)
+++ trunk/lib/pear/PEAR.php	2016年01月05日 20:53:59 UTC (rev 9749)
@@ -14,7 +14,6 @@
 * @author Greg Beaver <ce...@ph...>
 * @copyright 1997-2010 The Authors
 * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
 * @link http://pear.php.net/package/PEAR
 * @since File available since Release 0.1
 */
@@ -33,8 +32,6 @@
 */
 define('PEAR_ERROR_EXCEPTION', 32);
 /**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
- version_compare(zend_version(), "2-dev", "ge")));
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 define('OS_WINDOWS', true);
@@ -78,7 +75,7 @@
 * @author Greg Beaver <ce...@ph...>
 * @copyright 1997-2006 The PHP Group
 * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
 * @link http://pear.php.net/package/PEAR
 * @see PEAR_Error
 * @since Class available since PHP 4.0.2
@@ -137,6 +134,18 @@
 var $_expected_errors = array();
 
 /**
+ * List of methods that can be called both statically and non-statically.
+ * @var array
+ */
+ protected static $bivalentMethods = array(
+ 'setErrorHandling' => true,
+ 'raiseError' => true,
+ 'throwError' => true,
+ 'pushErrorHandling' => true,
+ 'popErrorHandling' => true,
+ );
+
+ /**
 * Constructor. Registers this object in
 * $_PEAR_destructor_object_list for destructor emulation if a
 * destructor object exists.
@@ -146,7 +155,7 @@
 * @access public
 * @return void
 */
- function PEAR($error_class = null)
+ function __construct($error_class = null)
 {
 $classname = strtolower(get_class($this));
 if ($this->_debug) {
@@ -174,6 +183,18 @@
 }
 
 /**
+ * Only here for backwards compatibility.
+ * E.g. Archive_Tar calls $this->PEAR() in its constructor.
+ *
+ * @param string $error_class Which class to use for error objects,
+ * defaults to PEAR_Error.
+ */
+ public function PEAR($error_class = null)
+ {
+ self::__construct($error_class);
+ }
+
+ /**
 * Destructor (the emulated type of...). Does nothing right now,
 * but is included for forward compatibility, so subclass
 * destructors should always call it.
@@ -190,19 +211,44 @@
 }
 }
 
+ public function __call($method, $arguments)
+ {
+ if (!isset(self::$bivalentMethods[$method])) {
+ trigger_error(
+ 'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+ );
+ }
+ return call_user_func_array(
+ array(get_class(), '_' . $method),
+ array_merge(array($this), $arguments)
+ );
+ }
+
+ public static function __callStatic($method, $arguments)
+ {
+ if (!isset(self::$bivalentMethods[$method])) {
+ trigger_error(
+ 'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+ );
+ }
+ return call_user_func_array(
+ array(get_class(), '_' . $method),
+ array_merge(array(null), $arguments)
+ );
+ }
+
 /**
 * If you have a class that's mostly/entirely static, and you need static
 * properties, you can use this method to simulate them. Eg. in your method(s)
 * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
 * You MUST use a reference, or they will not persist!
 *
- * @access public
 * @param string $class The calling classname, to prevent clashes
 * @param string $var The variable to retrieve.
 * @return mixed A reference to the variable. If not set it will be
 * auto initialised to NULL.
 */
- function &getStaticProperty($class, $var)
+ public static function &getStaticProperty($class, $var)
 {
 static $properties;
 if (!isset($properties[$class])) {
@@ -220,12 +266,12 @@
 * Use this function to register a shutdown method for static
 * classes.
 *
- * @access public
 * @param mixed $func The function name (or array of class/method) to call
 * @param mixed $args The arguments to pass to the function
+ *
 * @return void
 */
- function registerShutdownFunc($func, $args = array())
+ public static function registerShutdownFunc($func, $args = array())
 {
 // if we are called statically, there is a potential
 // that no shutdown func is registered. Bug #6445
@@ -244,10 +290,10 @@
 * only if $code is a string and
 * $obj->getMessage() == $code or
 * $code is an integer and $obj->getCode() == $code
- * @access public
+ *
 * @return bool true if parameter is an error
 */
- function isError($data, $code = null)
+ public static function isError($data, $code = null)
 {
 if (!is_a($data, 'PEAR_Error')) {
 return false;
@@ -269,6 +315,9 @@
 * PEAR objects. If called in an object, setErrorHandling sets
 * the default behaviour for that object.
 *
+ * @param object $object
+ * Object the method was called on (non-static mode)
+ *
 * @param int $mode
 * One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
 * PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
@@ -300,11 +349,12 @@
 *
 * @since PHP 4.0.5
 */
- function setErrorHandling($mode = null, $options = null)
- {
- if (isset($this) && is_a($this, 'PEAR')) {
- $setmode = &$this->_default_error_mode;
- $setoptions = &$this->_default_error_options;
+ protected static function _setErrorHandling(
+ $object, $mode = null, $options = null
+ ) {
+ if ($object !== null) {
+ $setmode = &$object->_default_error_mode;
+ $setoptions = &$object->_default_error_options;
 } else {
 $setmode = &$GLOBALS['_PEAR_default_error_mode'];
 $setoptions = &$GLOBALS['_PEAR_default_error_options'];
@@ -464,12 +514,12 @@
 * @param bool $skipmsg If true, raiseError will only pass error codes,
 * the error message parameter will be dropped.
 *
- * @access public
 * @return object a PEAR error object
 * @see PEAR::setErrorHandling
 * @since PHP 4.0.5
 */
- function &raiseError($message = null,
+ protected static function _raiseError($object,
+ $message = null,
 $code = null,
 $mode = null,
 $options = null,
@@ -487,10 +537,10 @@
 }
 
 if (
- isset($this) &&
- isset($this->_expected_errors) &&
- count($this->_expected_errors) > 0 &&
- count($exp = end($this->_expected_errors))
+ $object !== null &&
+ isset($object->_expected_errors) &&
+ count($object->_expected_errors) > 0 &&
+ count($exp = end($object->_expected_errors))
 ) {
 if ($exp[0] == "*" ||
 (is_int(reset($exp)) && in_array($code, $exp)) ||
@@ -503,9 +553,9 @@
 // No mode given, try global ones
 if ($mode === null) {
 // Class error handler
- if (isset($this) && isset($this->_default_error_mode)) {
- $mode = $this->_default_error_mode;
- $options = $this->_default_error_options;
+ if ($object !== null && isset($object->_default_error_mode)) {
+ $mode = $object->_default_error_mode;
+ $options = $object->_default_error_options;
 // Global error handler
 } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
 $mode = $GLOBALS['_PEAR_default_error_mode'];
@@ -515,18 +565,12 @@
 
 if ($error_class !== null) {
 $ec = $error_class;
- } elseif (isset($this) && isset($this->_error_class)) {
- $ec = $this->_error_class;
+ } elseif ($object !== null && isset($object->_error_class)) {
+ $ec = $object->_error_class;
 } else {
 $ec = 'PEAR_Error';
 }
 
- if (intval(PHP_VERSION) < 5) {
- // little non-eval hack to fix bug #12147
- include 'PEAR/FixPHP5PEARWarnings.php';
- return $a;
- }
-
 if ($skipmsg) {
 $a = new $ec($code, $mode, $options, $userinfo);
 } else {
@@ -548,14 +592,13 @@
 * @param string $userinfo If you need to pass along for example debug
 * information, this parameter is meant for that.
 *
- * @access public
 * @return object a PEAR error object
 * @see PEAR::raiseError
 */
- function &throwError($message = null, $code = null, $userinfo = null)
+ protected static function _throwError($object, $message = null, $code = null, $userinfo = null)
 {
- if (isset($this) && is_a($this, 'PEAR')) {
- $a = &$this->raiseError($message, $code, null, null, $userinfo);
+ if ($object !== null) {
+ $a = &$object->raiseError($message, $code, null, null, $userinfo);
 return $a;
 }
 
@@ -563,7 +606,7 @@
 return $a;
 }
 
- function staticPushErrorHandling($mode, $options = null)
+ public static function staticPushErrorHandling($mode, $options = null)
 {
 $stack = &$GLOBALS['_PEAR_error_handler_stack'];
 $def_mode = &$GLOBALS['_PEAR_default_error_mode'];
@@ -598,7 +641,7 @@
 return true;
 }
 
- function staticPopErrorHandling()
+ public static function staticPopErrorHandling()
 {
 $stack = &$GLOBALS['_PEAR_error_handler_stack'];
 $setmode = &$GLOBALS['_PEAR_default_error_mode'];
@@ -646,20 +689,20 @@
 *
 * @see PEAR::setErrorHandling
 */
- function pushErrorHandling($mode, $options = null)
+ protected static function _pushErrorHandling($object, $mode, $options = null)
 {
 $stack = &$GLOBALS['_PEAR_error_handler_stack'];
- if (isset($this) && is_a($this, 'PEAR')) {
- $def_mode = &$this->_default_error_mode;
- $def_options = &$this->_default_error_options;
+ if ($object !== null) {
+ $def_mode = &$object->_default_error_mode;
+ $def_options = &$object->_default_error_options;
 } else {
 $def_mode = &$GLOBALS['_PEAR_default_error_mode'];
 $def_options = &$GLOBALS['_PEAR_default_error_options'];
 }
 $stack[] = array($def_mode, $def_options);
 
- if (isset($this) && is_a($this, 'PEAR')) {
- $this->setErrorHandling($mode, $options);
+ if ($object !== null) {
+ $object->setErrorHandling($mode, $options);
 } else {
 PEAR::setErrorHandling($mode, $options);
 }
@@ -674,14 +717,14 @@
 *
 * @see PEAR::pushErrorHandling
 */
- function popErrorHandling()
+ protected static function _popErrorHandling($object)
 {
 $stack = &$GLOBALS['_PEAR_error_handler_stack'];
 array_pop($stack);
 list($mode, $options) = $stack[sizeof($stack) - 1];
 array_pop($stack);
- if (isset($this) && is_a($this, 'PEAR')) {
- $this->setErrorHandling($mode, $options);
+ if ($object !== null) {
+ $object->setErrorHandling($mode, $options);
 } else {
 PEAR::setErrorHandling($mode, $options);
 }
@@ -695,7 +738,7 @@
 * @param string $ext The extension name
 * @return bool Success or not on the dl() call
 */
- function loadExtension($ext)
+ public static function loadExtension($ext)
 {
 if (extension_loaded($ext)) {
 return true;
@@ -704,8 +747,7 @@
 // if either returns true dl() will produce a FATAL error, stop that
 if (
 function_exists('dl') === false ||
- ini_get('enable_dl') != 1 ||
- ini_get('safe_mode') == 1
+ ini_get('enable_dl') != 1
 ) {
 return false;
 }
@@ -726,10 +768,6 @@
 }
 }
 
-if (PEAR_ZE2) {
- include_once 'PEAR5.php';
-}
-
 function _PEAR_call_destructors()
 {
 global $_PEAR_destructor_object_list;
@@ -737,12 +775,9 @@
 sizeof($_PEAR_destructor_object_list))
 {
 reset($_PEAR_destructor_object_list);
- if (PEAR_ZE2) {
- $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
- } else {
- $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
- }
 
+ $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
+
 if ($destructLifoExists) {
 $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
 }
@@ -788,7 +823,7 @@
 * @author Gregory Beaver <ce...@ph...>
 * @copyright 1997-2006 The PHP Group
 * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
 * @link http://pear.php.net/manual/en/core.pear.pear-error.php
 * @see PEAR::raiseError(), PEAR::throwError()
 * @since Class available since PHP 4.0.2
@@ -823,7 +858,7 @@
 * @access public
 *
 */
- function PEAR_Error($message = 'unknown error', $code = null,
+ function __construct($message = 'unknown error', $code = null,
 $mode = null, $options = null, $userinfo = null)
 {
 if ($mode === null) {
@@ -834,11 +869,7 @@
 $this->mode = $mode;
 $this->userinfo = $userinfo;
 
- if (PEAR_ZE2) {
- $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
- } else {
- $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
- }
+ $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
 
 if (!$skiptrace) {
 $this->backtrace = debug_backtrace();
@@ -897,6 +928,24 @@
 }
 
 /**
+ * Only here for backwards compatibility.
+ *
+ * Class "Cache_Error" still uses it, among others.
+ *
+ * @param string $message Message
+ * @param int $code Error code
+ * @param int $mode Error mode
+ * @param mixed $options See __construct()
+ * @param string $userinfo Additional user/debug info
+ */
+ public function PEAR_Error(
+ $message = 'unknown error', $code = null, $mode = null,
+ $options = null, $userinfo = null
+ ) {
+ self::__construct($message, $code, $mode, $options, $userinfo);
+ }
+
+ /**
 * Get the error mode from an error object.
 *
 * @return int error mode
Deleted: trunk/lib/pear/PEAR5.php
===================================================================
--- trunk/lib/pear/PEAR5.php	2016年01月05日 20:16:20 UTC (rev 9748)
+++ trunk/lib/pear/PEAR5.php	2016年01月05日 20:53:59 UTC (rev 9749)
@@ -1,33 +0,0 @@
-<?php
-/**
- * This is only meant for PHP 5 to get rid of certain strict warning
- * that doesn't get hidden since it's in the shutdown function
- */
-class PEAR5
-{
- /**
- * If you have a class that's mostly/entirely static, and you need static
- * properties, you can use this method to simulate them. Eg. in your method(s)
- * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
- * You MUST use a reference, or they will not persist!
- *
- * @access public
- * @param string $class The calling classname, to prevent clashes
- * @param string $var The variable to retrieve.
- * @return mixed A reference to the variable. If not set it will be
- * auto initialised to NULL.
- */
- static function &getStaticProperty($class, $var)
- {
- static $properties;
- if (!isset($properties[$class])) {
- $properties[$class] = array();
- }
-
- if (!array_key_exists($var, $properties[$class])) {
- $properties[$class][$var] = null;
- }
-
- return $properties[$class][$var];
- }
-}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9748
 http://sourceforge.net/p/phpwiki/code/9748
Author: vargenau
Date: 2016年01月05日 20:16:20 +0000 (2016年1月05日)
Log Message:
-----------
Update Pear DB to release 1.9.2
Modified Paths:
--------------
 trunk/lib/pear/DB/common.php
 trunk/lib/pear/DB/dbase.php
 trunk/lib/pear/DB/fbsql.php
 trunk/lib/pear/DB/ibase.php
 trunk/lib/pear/DB/ifx.php
 trunk/lib/pear/DB/msql.php
 trunk/lib/pear/DB/mssql.php
 trunk/lib/pear/DB/mysql.php
 trunk/lib/pear/DB/mysqli.php
 trunk/lib/pear/DB/oci8.php
 trunk/lib/pear/DB/odbc.php
 trunk/lib/pear/DB/pgsql.php
 trunk/lib/pear/DB/sqlite.php
 trunk/lib/pear/DB/storage.php
 trunk/lib/pear/DB/sybase.php
 trunk/lib/pear/DB.php
Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/common.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -42,7 +42,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_common extends PEAR
@@ -145,7 +145,7 @@
 *
 * @return void
 */
- function DB_common()
+ function __construct()
 {
 $this->PEAR('DB_Error');
 }
Modified: trunk/lib/pear/DB/dbase.php
===================================================================
--- trunk/lib/pear/DB/dbase.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/dbase.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -41,7 +41,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_dbase extends DB_common
@@ -140,13 +140,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_dbase()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/fbsql.php
===================================================================
--- trunk/lib/pear/DB/fbsql.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/fbsql.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -41,7 +41,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 * @since Class functional since Release 1.7.0
 */
@@ -124,13 +124,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_fbsql()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/ibase.php
===================================================================
--- trunk/lib/pear/DB/ibase.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/ibase.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -49,7 +49,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 * @since Class became stable in Release 1.7.0
 */
@@ -180,13 +180,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_ibase()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/ifx.php
===================================================================
--- trunk/lib/pear/DB/ifx.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/ifx.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -48,7 +48,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_ifx extends DB_common
@@ -167,13 +167,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_ifx()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/msql.php
===================================================================
--- trunk/lib/pear/DB/msql.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/msql.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -47,7 +47,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 * @since Class not functional until Release 1.7.0
 */
@@ -126,13 +126,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_msql()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/mssql.php
===================================================================
--- trunk/lib/pear/DB/mssql.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/mssql.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -49,7 +49,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_mssql extends DB_common
@@ -179,13 +179,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_mssql()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/mysql.php
===================================================================
--- trunk/lib/pear/DB/mysql.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/mysql.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -41,7 +41,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_mysql extends DB_common
@@ -162,13 +162,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_mysql()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/mysqli.php
===================================================================
--- trunk/lib/pear/DB/mysqli.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/mysqli.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -43,7 +43,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 * @since Class functional since Release 1.6.3
 */
@@ -224,13 +224,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_mysqli()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
@@ -497,7 +497,11 @@
 */
 function freeResult($result)
 {
- return is_resource($result) ? mysqli_free_result($result) : false;
+ if (! $result instanceof mysqli_result) {
+ return false;
+ }
+ mysqli_free_result($result);
+ return true;
 }
 
 // }}}
@@ -1031,6 +1035,10 @@
 ? $this->mysqli_types[$tmp->type]
 : 'unknown',
 // http://bugs.php.net/?id=36579
+ // Doc Bug #36579: mysqli_fetch_field length handling
+ // https://bugs.php.net/bug.php?id=62426
+ // Bug #62426: mysqli_fetch_field_direct returns incorrect
+ // length on UTF8 fields
 'len' => $tmp->length,
 'flags' => $flags,
 );
Modified: trunk/lib/pear/DB/oci8.php
===================================================================
--- trunk/lib/pear/DB/oci8.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/oci8.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -47,7 +47,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_oci8 extends DB_common
@@ -173,13 +173,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_oci8()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/odbc.php
===================================================================
--- trunk/lib/pear/DB/odbc.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/odbc.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -44,7 +44,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_odbc extends DB_common
@@ -153,13 +153,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_odbc()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/pgsql.php
===================================================================
--- trunk/lib/pear/DB/pgsql.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/pgsql.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -43,7 +43,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_pgsql extends DB_common
@@ -148,13 +148,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_pgsql()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/sqlite.php
===================================================================
--- trunk/lib/pear/DB/sqlite.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/sqlite.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -47,7 +47,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_sqlite extends DB_common
@@ -152,13 +152,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_sqlite()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB/storage.php
===================================================================
--- trunk/lib/pear/DB/storage.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/storage.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -38,7 +38,7 @@
 * @author Stig Bakken <st...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_storage extends PEAR
@@ -94,7 +94,7 @@
 * a reference to this object
 *
 */
- function DB_storage($table, $keycolumn, &$dbh, $validator = null)
+ function __construct($table, $keycolumn, &$dbh, $validator = null)
 {
 $this->PEAR('DB_Error');
 $this->_table = $table;
Modified: trunk/lib/pear/DB/sybase.php
===================================================================
--- trunk/lib/pear/DB/sybase.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/sybase.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -17,7 +17,7 @@
 * @category Database
 * @package DB
 * @author Sterling Hughes <ste...@ph...>
- * @author Antônio Carlos Venâncio Júnior <fl...@ph...>
+ * @author Antônio Carlos Venâncio Júnior
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
@@ -42,11 +42,11 @@
 * @category Database
 * @package DB
 * @author Sterling Hughes <ste...@ph...>
- * @author Antônio Carlos Venâncio Júnior <fl...@ph...>
+ * @author Antônio Carlos Venâncio Júnior
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_sybase extends DB_common
@@ -141,13 +141,13 @@
 // {{{ constructor
 
 /**
- * This constructor calls <kbd>$this->DB_common()</kbd>
+ * This constructor calls <kbd>parent::__construct()</kbd>
 *
 * @return void
 */
- function DB_sybase()
+ function __construct()
 {
- $this->DB_common();
+ parent::__construct();
 }
 
 // }}}
Modified: trunk/lib/pear/DB.php
===================================================================
--- trunk/lib/pear/DB.php	2015年12月14日 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB.php	2016年01月05日 20:16:20 UTC (rev 9748)
@@ -426,7 +426,7 @@
 * @author Daniel Convissor <da...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB
@@ -577,7 +577,7 @@
 */
 function apiVersion()
 {
- return '1.8.2';
+ return '1.9.2';
 }
 
 // }}}
@@ -941,7 +941,7 @@
 * @author Stig Bakken <ss...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_Error extends PEAR_Error
@@ -959,18 +959,32 @@
 *
 * @see PEAR_Error
 */
- function DB_Error($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
+ function __construct($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
 $level = E_USER_NOTICE, $debuginfo = null)
 {
 if (is_int($code)) {
- $this->PEAR_Error('DB Error: ' . DB::errorMessage($code), $code,
+ parent::__construct('DB Error: ' . DB::errorMessage($code), $code,
 $mode, $level, $debuginfo);
 } else {
- $this->PEAR_Error("DB Error: $code", DB_ERROR,
+ parent::__construct("DB Error: $code", DB_ERROR,
 $mode, $level, $debuginfo);
 }
 }
 
+ /**
+ * Workaround to both avoid the "Redefining already defined constructor"
+ * PHP error and provide backward compatibility in case someone is calling
+ * DB_Error() dynamically
+ */
+ public function __call($method, $arguments)
+ {
+ if ($method == 'DB_Error') {
+ return call_user_func_array(array($this, '__construct'), $arguments);
+ }
+ trigger_error(
+ 'Call to undefined method DB_Error::' . $method . '()', E_USER_ERROR
+ );
+ }
 // }}}
 }
 
@@ -988,7 +1002,7 @@
 * @author Stig Bakken <ss...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 */
 class DB_result
@@ -1095,7 +1109,7 @@
 *
 * @return void
 */
- function DB_result(&$dbh, $result, $options = array())
+ function __construct(&$dbh, $result, $options = array())
 {
 $this->autofree = $dbh->options['autofree'];
 $this->dbh = &$dbh;
@@ -1453,7 +1467,7 @@
 * @author Stig Bakken <ss...@ph...>
 * @copyright 1997-2007 The PHP Group
 * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.8.2
+ * @version Release: 1.9.2
 * @link http://pear.php.net/package/DB
 * @see DB_common::setFetchMode()
 */
@@ -1468,7 +1482,7 @@
 *
 * @return void
 */
- function DB_row(&$arr)
+ function __construct(&$arr)
 {
 foreach ($arr as $key => $value) {
 $this->$key = &$arr[$key];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.