phpwiki-checkins Mailing List for PhpWiki

Revision: 7295
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7295&view=rev
Author: vargenau
Date: 2010年01月27日 12:40:44 +0000 (2010年1月27日)
Log Message:
-----------
Assigning the return value of new by reference is deprecated
Modified Paths:
--------------
 trunk/lib/pear/DB.php
Modified: trunk/lib/pear/DB.php
===================================================================
--- trunk/lib/pear/DB.php	2010年01月27日 10:14:23 UTC (rev 7294)
+++ trunk/lib/pear/DB.php	2010年01月27日 12:40:44 UTC (rev 7295)
@@ -307,7 +307,7 @@
 return $tmp;
 }
 
- @$obj =& new $classname;
+ @$obj = new $classname;
 
 foreach ($options as $option => $value) {
 $test = $obj->setOption($option, $value);
@@ -381,7 +381,7 @@
 return $tmp;
 }
 
- @$obj =& new $classname;
+ @$obj = new $classname;
 
 foreach ($options as $option => $value) {
 $test = $obj->setOption($option, $value);
@@ -887,7 +887,7 @@
 if ($object_class == 'stdClass') {
 $arr = (object) $arr;
 } else {
- $arr = &new $object_class($arr);
+ $arr = new $object_class($arr);
 }
 }
 return $arr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7294
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7294&view=rev
Author: vargenau
Date: 2010年01月27日 10:14:23 +0000 (2010年1月27日)
Log Message:
-----------
Valid XHTML
Modified Paths:
--------------
 trunk/themes/Sidebar/templates/dump-footer.tmpl
Modified: trunk/themes/Sidebar/templates/dump-footer.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/dump-footer.tmpl	2010年01月22日 15:28:52 UTC (rev 7293)
+++ trunk/themes/Sidebar/templates/dump-footer.tmpl	2010年01月27日 10:14:23 UTC (rev 7294)
@@ -4,6 +4,6 @@
 ?>
 <hr class="printer" noshade="noshade" />
 <div class="visualClear"></div>
-<div><?= $WikiTheme->getOwnerMessage($page) ?> <?= $WikiTheme->getLastModifiedMessage($revision) ?> <?= $WikiTheme->getAuthorMessage($revision) ?><br>
+<div><?= $WikiTheme->getOwnerMessage($page) ?> <?= $WikiTheme->getLastModifiedMessage($revision) ?> <?= $WikiTheme->getAuthorMessage($revision) ?><br />
 This page was accessed <?= $page->get('hits') ?> times, and edited <?= $revision->getVersion() ?> times.</div>
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7293
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7293&view=rev
Author: vargenau
Date: 2010年01月22日 15:28:52 +0000 (2010年1月22日)
Log Message:
-----------
Improve RssFeed plugin CSS
Modified Paths:
--------------
 trunk/themes/gforge/gforge.css
Modified: trunk/themes/gforge/gforge.css
===================================================================
--- trunk/themes/gforge/gforge.css	2010年01月22日 15:26:58 UTC (rev 7292)
+++ trunk/themes/gforge/gforge.css	2010年01月22日 15:28:52 UTC (rev 7293)
@@ -894,14 +894,19 @@
 td.sidebar { border-spacing: 0px; margin: 0ex;}
 
 /* RssFeed */
-div.rss { margin: 1em; padding: 1em; font-size: 0.9em; background-color: #eeeeee; border: thin dashed #aaaaaa; }
-div.feed { color: #333; margin: -0.5em; margin-bottom: 0em; padding: 0.3em; font-weight: bold; background-color: #f2f2f2; font-size: 1.2em; }
-div.itemdesc { padding-left: 1em; }
-div.rssitem { border-top: thin dashed #aaaaaa; }
+div.rss { margin: 1em; padding: 1em; }
+div.feed { margin: -0.5em; margin-bottom: 0em; padding: 0.3em;
+ font-weight: bold; font-size: 1.2em; }
+.chandesc { font-weight: bold; }
+div.rssitem { padding-top:1em; padding-bottom: 1em;
+ border-top: 2px solid #565c5e; /* Alcatel-Lucent grey */ }
+div.itemname { padding-bottom: 1em; font-weight: bold; }
+div.itemdesc { padding-left: 1em; }
+div.authordate { font-style: italic; }
 a.rssicon { font-weight:normal; font-size:small; vertical-align:middle; }
 
 /* SqlResult */
-table.sqlresult { 
+table.sqlresult {
 border: 1px outset gray;
 background: white;
 margin: 0.5ex 0.5em;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7292
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7292&view=rev
Author: vargenau
Date: 2010年01月22日 15:26:58 +0000 (2010年1月22日)
Log Message:
-----------
Fix caption centering problem
Modified Paths:
--------------
 trunk/themes/gforge/gforge.css
Modified: trunk/themes/gforge/gforge.css
===================================================================
--- trunk/themes/gforge/gforge.css	2010年01月22日 15:16:55 UTC (rev 7291)
+++ trunk/themes/gforge/gforge.css	2010年01月22日 15:26:58 UTC (rev 7292)
@@ -151,7 +151,6 @@
 caption-side: top;
 text-align: left;
 margin-bottom: .5ex;
- width: 100%;
 }
 
 /**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7291
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7291&view=rev
Author: vargenau
Date: 2010年01月22日 15:16:55 +0000 (2010年1月22日)
Log Message:
-----------
Add AUTHOR and PUBDATE in RSS feed
Modified Paths:
--------------
 trunk/lib/RssParser.php
 trunk/lib/plugin/RssFeed.php
Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php	2010年01月22日 15:12:23 UTC (rev 7290)
+++ trunk/lib/RssParser.php	2010年01月22日 15:16:55 UTC (rev 7291)
@@ -45,6 +45,8 @@
 extends XmlParser {
 
 var $title = "";
+ var $author = "";
+ var $pubDate = "";
 var $link = "";
 var $description = "";
 var $inside_item = false;
@@ -81,6 +83,8 @@
 $GLOBALS['rss_parser_items'] =& $this->items;
 }
 $this->items[] = array("title" => $this->item['TITLE'],
+ "author" => $this->item['AUTHOR'],
+ "pubDate" => $this->item['PUBDATE'],
 "description" => @$this->item['DESCRIPTION'],
 "link" => $this->item['LINK']);
 $this->item = array("TITLE" => "",
Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php	2010年01月22日 15:12:23 UTC (rev 7290)
+++ trunk/lib/plugin/RssFeed.php	2010年01月22日 15:16:55 UTC (rev 7291)
@@ -98,6 +98,11 @@
 HTML::a(array('href'=>$item['link']),
 HTML::raw($item['title'])));
 $cell->pushContent($cell_title);
+ $cell_author = HTML::raw($item['author']);
+ $cell_pubDate = HTML::raw($item['pubDate']);
+ $cell_authordate = HTML::div(array('class'=> 'authordate'), 
+ $cell_author, HTML::raw(" - "), $cell_pubDate);
+ $cell->pushContent($cell_authordate);
 if (!empty($item['description']))
 $cell->pushContent(HTML::div(array('class'=> 'itemdesc'),
 HTML::raw($item['description'])));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7290
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7290&view=rev
Author: vargenau
Date: 2010年01月22日 15:12:23 +0000 (2010年1月22日)
Log Message:
-----------
Fix notice when editing a wiki page
Modified Paths:
--------------
 trunk/lib/pear/DB/common.php
Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php	2010年01月22日 14:59:22 UTC (rev 7289)
+++ trunk/lib/pear/DB/common.php	2010年01月22日 15:12:23 UTC (rev 7290)
@@ -1137,7 +1137,7 @@
 if (DB::isError($sth)) {
 return $sth;
 }
- $ret =& $this->execute($sth, $params);
+ $ret = $this->execute($sth, $params);
 $this->freePrepared($sth);
 return $ret;
 } else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7289
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7289&view=rev
Author: vargenau
Date: 2010年01月22日 14:59:22 +0000 (2010年1月22日)
Log Message:
-----------
Add summary in e-mail notification
Modified Paths:
--------------
 trunk/lib/MailNotify.php
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2010年01月22日 14:54:05 UTC (rev 7288)
+++ trunk/lib/MailNotify.php	2010年01月22日 14:59:22 UTC (rev 7289)
@@ -287,8 +287,9 @@
 $content .= $wikitext;
 }
 $editedby = sprintf(_("Edited by: %s"), $this->from);
+ $summary = sprintf(_("Summary: %s"), $meta['summary']);
 $this->sendMail($subject, 
- $editedby."\n".$difflink."\n\n".$content);
+ $editedby."\n".$summary."\n".$difflink."\n\n".$content);
 }
 
 /** 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7288
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7288&view=rev
Author: vargenau
Date: 2010年01月22日 14:54:05 +0000 (2010年1月22日)
Log Message:
-----------
New Fusion Forge syntax; WikiConfig for Fusion Forge
Modified Paths:
--------------
 trunk/g
Modified: trunk/g
===================================================================
--- trunk/g	2010年01月22日 14:40:20 UTC (rev 7287)
+++ trunk/g	2010年01月22日 14:54:05 UTC (rev 7288)
@@ -47,7 +47,9 @@
 // Disable compression, seems needed to get all the messages.
 $no_gz_buffer=true;
 
-require_once('pre.php');
+require_once('../env.inc.php');
+require_once $gfwww.'include/pre.php';
+require_once $gfplugins.'wiki/include/wikiconfig.class.php';
 
 if (!$group_id || !$project) {
 exit_error("Invalid Project", "Invalid Project");
@@ -59,6 +61,8 @@
 $group_public_name = $project->getPublicName();
 $is_external = $project->getIsExternal();
 
+ $wc = new WikiConfig($group_id);
+
 define('VIRTUAL_PATH', '/wiki/g/'.$group_name);
 define('PAGE_PREFIX', '_g'.$group_id.'_');
 
@@ -79,6 +83,10 @@
 
 define('WIKI_NAME', $group_name);
 
+ define('DISABLE_MARKUP_WIKIWORD', $wc->getWikiConfig('DISABLE_MARKUP_WIKIWORD'));
+
+ define('NUM_SPAM_LINKS', 20 * ($wc->getWikiConfig('NUM_SPAM_LINKS')));
+
 define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/');
 // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
 define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
@@ -101,7 +109,7 @@
 define('DEBUG', ($sys_install_type != 'production'));
 // define('_DEBUG_LOGIN', true);
 
- // Postgesql
+ // Postgresql
 define('DATABASE_TYPE', 'SQL');
 // Dummy value (to avoid warning in SystemInfo plugin)
 define('DATABASE_DSN', 'pgsql://localhost/user_phpwiki');
@@ -109,7 +117,9 @@
 // Disable VACUUM (they are performed every night)
 define('DATABASE_OPTIMISE_FREQUENCY', 0);
 
- define('ADMIN_USER', 'ACOS Forge Administrator');
+ // TBD: the name should be taken from Gforge
+ // define('ADMIN_USER', 'ACOS Forge Administrator');
+ define('ADMIN_USER', 'The PhpWiki programming team');
 // Dummy value
 define('ADMIN_PASSWD', 'xxx');
 
@@ -258,7 +268,7 @@
 }
 
 // Load the default configuration.
- include "index.php";
+ include dirname(__FILE__).'/index.php';
 
 // Override the default configuration for VARIABLES after index.php:
 // E.g. Use another DB:
@@ -269,7 +279,7 @@
 $DBParams['prefix'] = "plugin_wiki_";
 
 // Start the wiki
- include "lib/main.php";
+ include dirname(__FILE__).'/lib/main.php';
 }
 
 /**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7287
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7287&view=rev
Author: vargenau
Date: 2010年01月22日 14:40:20 +0000 (2010年1月22日)
Log Message:
-----------
Do not print date of last edition
Modified Paths:
--------------
 trunk/themes/gforge/gforge-print.css
Modified: trunk/themes/gforge/gforge-print.css
===================================================================
--- trunk/themes/gforge/gforge-print.css	2010年01月22日 14:06:31 UTC (rev 7286)
+++ trunk/themes/gforge/gforge-print.css	2010年01月22日 14:40:20 UTC (rev 7287)
@@ -51,6 +51,9 @@
 /* Do not print main wiki browse banner */
 .browsebanner { display: none; }
 
+/* Do not print date of last edition */
+.editdate { display: none; }
+
 /* Print links in black */
 a { color: black; }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7286
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7286&view=rev
Author: vargenau
Date: 2010年01月22日 14:06:31 +0000 (2010年1月22日)
Log Message:
-----------
Process log messages of type 'E_DEPRECATED' as warnings (for PHP 5.3 migration)
Modified Paths:
--------------
 trunk/lib/ErrorManager.php
 trunk/lib/main.php
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2010年01月22日 13:58:31 UTC (rev 7285)
+++ trunk/lib/ErrorManager.php	2010年01月22日 14:06:31 UTC (rev 7286)
@@ -12,9 +12,9 @@
 error_reporting(E_ALL & ~E_STRICT);
 }
 */
-define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048);
+define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048 & ((check_php_version(5,3)) ? ~E_DEPRECATED : ~0));
 define ('EM_WARNING_ERRORS',
-	E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING);
+	E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | ((check_php_version(5,3)) ? E_DEPRECATED : 0));
 define ('EM_NOTICE_ERRORS', E_NOTICE | E_USER_NOTICE);
 
 /* It is recommended to leave assertions on. 
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010年01月22日 13:58:31 UTC (rev 7285)
+++ trunk/lib/main.php	2010年01月22日 14:06:31 UTC (rev 7286)
@@ -2,6 +2,8 @@
 rcs_id('$Id$');
 /*
 * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
+ * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2009 Roger Guignard, Alcatel-Lucent
 *
 * This file is part of PhpWiki.
 *
@@ -1330,7 +1332,7 @@
 // Postpone warnings
 global $ErrorManager;
 if (defined('E_STRICT')) // and (E_ALL & E_STRICT)) // strict php5?
- $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING|E_STRICT);
+ $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING|E_STRICT|((check_php_version(5,3)) ? E_DEPRECATED : 0));
 else
 $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING);
 $request = new WikiRequest();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7285
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7285&view=rev
Author: vargenau
Date: 2010年01月22日 13:58:31 +0000 (2010年1月22日)
Log Message:
-----------
Replace 'split' function (deprecated in PHP5.3) by 'explode' function (for PHP 5.3 migration)
Modified Paths:
--------------
 trunk/lib/CachedMarkup.php
 trunk/lib/PageType.php
 trunk/lib/stdlib.php
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2010年01月22日 13:52:52 UTC (rev 7284)
+++ trunk/lib/CachedMarkup.php	2010年01月22日 13:58:31 UTC (rev 7285)
@@ -682,7 +682,7 @@
 }
 
 function getPagename($basepage) {
- list ($moniker, $page) = split (":", $this->_link, 2);
+ list ($moniker, $page) = explode (":", $this->_link, 2);
 	$page = new WikiPageName($page, $basepage);
 	if ($page->isValid()) return $page->name;
 	else return false;
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2010年01月22日 13:52:52 UTC (rev 7284)
+++ trunk/lib/PageType.php	2010年01月22日 13:58:31 UTC (rev 7285)
@@ -170,7 +170,7 @@
 
 function link ($link, $linktext = false) {
 	global $WikiTheme;
- list ($moniker, $page) = split (":", $link, 2);
+ list ($moniker, $page) = explode (":", $link, 2);
 
 if (!isset($this->_map[$moniker])) {
 return HTML::span(array('class' => 'bad-interwiki'),
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2010年01月22日 13:52:52 UTC (rev 7284)
+++ trunk/lib/stdlib.php	2010年01月22日 13:58:31 UTC (rev 7285)
@@ -425,7 +425,7 @@
 if (empty($alt)) $alt = "";
 
 // Extract URL
- $arr = split(' ',$url);
+ $arr = explode(' ',$url);
 if (!empty($arr)) $url = $arr[0];
 if (! IsSafeURL($url)) {
 $link = HTML::span(array('class' => 'error'), _("BAD URL -- remove all of <, >, \""));
@@ -633,7 +633,7 @@
 $img->setAttr('src', false);
 }
 } else {
- $args = split(' ', $url);
+ $args = explode(' ', $url);
 if (count($args) >= 1) {
 $url = array_shift($args);
 $found = array();
@@ -716,7 +716,7 @@
 function SplitQueryArgs ($query_args = '') 
 {
 // FIXME: use the arg-seperator which might not be &
- $split_args = split('&', $query_args);
+ $split_args = explode('&', $query_args);
 $args = array();
 while (list($key, $val) = each($split_args))
 if (preg_match('/^ ([^=]+) =? (.*) /x', $val, $m))
@@ -827,7 +827,7 @@
 if (is_string($name)) {
 $this->shortName = $name;
 if (strstr($name, ':')) {
- list($moniker, $shortName) = split (":", $name, 2);
+ list($moniker, $shortName) = explode (":", $name, 2);
 	 	$map = getInterwikiMap(); // allow overrides to custom maps
 if (isset($map->_map[$moniker])) {
 $url = $map->_map[$moniker];
@@ -846,7 +846,7 @@
 $name = $url;
 }
 if (strstr($shortName, '?')) {
- list($shortName, $dummy) = split("\?", $shortName, 2);
+ list($shortName, $dummy) = explode("\?", $shortName, 2);
 		 }
 $this->shortName = $shortName;
 }
@@ -1212,7 +1212,7 @@
 * @return string
 */
 function expand_tabs($str, $tab_width = 8) {
- $split = split("\t", $str);
+ $split = explode("\t", $str);
 $tail = array_pop($split);
 $expanded = "\n";
 foreach ($split as $hunk) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7284
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7284&view=rev
Author: vargenau
Date: 2010年01月22日 13:52:52 +0000 (2010年1月22日)
Log Message:
-----------
Verify that a parameter is an object before attempting to get his class (for PHP 5 migration)
Modified Paths:
--------------
 trunk/lib/XmlElement.php
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2010年01月18日 19:13:06 UTC (rev 7283)
+++ trunk/lib/XmlElement.php	2010年01月22日 13:52:52 UTC (rev 7284)
@@ -40,7 +40,7 @@
 }
 
 function _pushContent ($item) {
- if (strtolower(get_class($item)) == 'xmlcontent')
+ if (is_object($item) && strtolower(get_class($item)) == 'xmlcontent')
 array_splice($this->_content, count($this->_content), 0,
 $item->_content);
 else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7283
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7283&view=rev
Author: vargenau
Date: 2010年01月18日 19:13:06 +0000 (2010年1月18日)
Log Message:
-----------
Make saving preferences work in PHP 5
Modified Paths:
--------------
 trunk/lib/WikiUserNew.php
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2009年12月04日 17:08:19 UTC (rev 7282)
+++ trunk/lib/WikiUserNew.php	2010年01月18日 19:13:06 UTC (rev 7283)
@@ -2,6 +2,7 @@
 rcs_id('$Id$');
 /* Copyright (C) 2004,2005,2006,2007,2009 $ThePhpWikiProgrammingTeam
 * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2009 Roger Guignard, Alcatel-Lucent
 *
 * This file is part of PhpWiki.
 * 
@@ -1175,33 +1176,15 @@
 // FIXME: strange why this should be needed...
 include_once("lib/WikiUser/Db.php");
 include_once("lib/WikiUser/AdoDb.php");
- if (check_php_version(5)) {
- $user = new _AdoDbPassUser($this->_userid, $this->_prefs);
- return $user->getPreferences();
- } else {
- _AdoDbPassUser::_AdoDbPassUser($this->_userid, $this->_prefs);
- return _AdoDbPassUser::getPreferences();
- }
+ return _AdoDbPassUser::getPreferences();
 } elseif ($this->_prefs->_method == 'SQL') {
 include_once("lib/WikiUser/Db.php");
 include_once("lib/WikiUser/PearDb.php");
- if (check_php_version(5)) {
- $user = new _PearDbPassUser($this->_userid, $this->_prefs);
- return $user->getPreferences();
- } else {
- _PearDbPassUser::_PearDbPassUser($this->_userid, $this->_prefs);
- return _PearDbPassUser::getPreferences();
- }
+ return _PearDbPassUser::getPreferences();
 } elseif ($this->_prefs->_method == 'PDO') {
 include_once("lib/WikiUser/Db.php");
 include_once("lib/WikiUser/PdoDb.php");
- if (check_php_version(5)) {
- $user = new _PdoDbPassUser($this->_userid, $this->_prefs);
- return $user->getPreferences();
- } else {
- _PdoDbPassUser::_PdoDbPassUser($this->_userid, $this->_prefs);
- return _PdoDbPassUser::getPreferences();
- }
+ return _PdoDbPassUser::getPreferences();
 }
 }
 
@@ -1228,35 +1211,17 @@
 // FIXME: strange why this should be needed...
 include_once("lib/WikiUser/Db.php");
 include_once("lib/WikiUser/AdoDb.php");
- if (check_php_version(5)) {
- $user = new _AdoDbPassUser($this->_userid, $prefs);
- return $user->setPreferences($prefs, $id_only);
- } else {
- _AdoDbPassUser::_AdoDbPassUser($this->_userid, $prefs);
- return _AdoDbPassUser::setPreferences($prefs, $id_only);
- }
+ return _AdoDbPassUser::setPreferences($prefs, $id_only);
 }
 elseif ($this->_prefs->_method == 'SQL') {
 include_once("lib/WikiUser/Db.php");
 include_once("lib/WikiUser/PearDb.php");
- if (check_php_version(5)) {
- $user = new _PearDbPassUser($this->_userid, $prefs);
- return $user->setPreferences($prefs, $id_only);
- } else {
- _PearDbPassUser::_PearDbPassUser($this->_userid, $prefs);
- return _PearDbPassUser::setPreferences($prefs, $id_only);
- }
+ return _PearDbPassUser::setPreferences($prefs, $id_only);
 }
 elseif ($this->_prefs->_method == 'PDO') {
 include_once("lib/WikiUser/Db.php");
 include_once("lib/WikiUser/PdoDb.php");
- if (check_php_version(5)) {
- $user = new _PdoDbPassUser($this->_userid, $prefs);
- return $user->setPreferences($prefs, $id_only);
- } else {
- _PdoDbPassUser::_PdoDbPassUser($this->_userid, $prefs);
- return _PdoDbPassUser::setPreferences($prefs, $id_only);
- }
+ return _PdoDbPassUser::setPreferences($prefs, $id_only);
 }
 }
 if ($updated = _AnonUser::setPreferences($prefs, $id_only)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.