Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/lib/plugin FuzzyPages.php,1.9,1.10 InterWikiSearch.php,1.1,1.2 PluginManager.php,1.4,1.5 SystemInfo.php,1.6,1.7 UserPreferences.php,1.6,1.7 WikiAdminSelect.php,1.2,1.3
|
From: Geoffrey T. D. <da...@us...> - 2003-02-22 20:50:00
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv18035/lib/plugin
Modified Files:
FuzzyPages.php InterWikiSearch.php PluginManager.php
SystemInfo.php UserPreferences.php WikiAdminSelect.php
Log Message:
Fixes for "Call-time pass by reference has been deprecated" errors.
Index: FuzzyPages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/FuzzyPages.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- FuzzyPages.php 18 Jan 2003 21:41:02 -0000 1.9
+++ FuzzyPages.php 22 Feb 2003 20:49:55 -0000 1.10
@@ -59,5 +59,5 @@ extends WikiPlugin
$spelling_similarity_score = 0;
similar_text($subject, $this->_searchterm,
- &$spelling_similarity_score);
+ $spelling_similarity_score);
return $spelling_similarity_score;
}
@@ -66,5 +66,5 @@ extends WikiPlugin
$sound_similarity_score = 0;
similar_text(metaphone($subject), $this->_searchterm_metaphone,
- &$sound_similarity_score);
+ $sound_similarity_score);
return $sound_similarity_score;
}
@@ -87,11 +87,10 @@ extends WikiPlugin
$similarity_score = $this->averageSimilarities($pagename);
if ($similarity_score > MIN_SCORE_CUTOFF)
- $list = array_merge($list,
- array($pagename => $similarity_score));
+ $list[$pagename] = $similarity_score;
}
}
function sortCollectedPages(&$list) {
- array_multisort(&$list, SORT_NUMERIC, SORT_DESC);
+ arsort($list, SORT_NUMERIC);
}
@@ -141,5 +140,5 @@ extends WikiPlugin
'border' => 0,
'class' => 'pagelist'));
- $this->addTableCaption($table, &$dbi);
+ $this->addTableCaption($table, $dbi);
$this->addTableHead($table);
$this->addTableBody($list, $table);
@@ -158,9 +157,9 @@ extends WikiPlugin
$this->_list = array();
- $this->collectSimilarPages($this->_list, &$dbi);
+ $this->collectSimilarPages($this->_list, $dbi);
$this->sortCollectedPages($this->_list);
- return $this->formatTable($this->_list, &$dbi);
+ return $this->formatTable($this->_list, $dbi);
}
@@ -188,4 +187,7 @@ extends WikiPlugin
// $Log$
+// Revision 1.10 2003/02/22 20:49:55 dairiki
+// Fixes for "Call-time pass by reference has been deprecated" errors.
+//
// Revision 1.9 2003/01/18 21:41:02 carstenklapp
// Code cleanup:
Index: InterWikiSearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/InterWikiSearch.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- InterWikiSearch.php 31 Jan 2003 22:56:21 -0000 1.1
+++ InterWikiSearch.php 22 Feb 2003 20:49:56 -0000 1.2
@@ -81,6 +81,6 @@ extends interWikiMapPageType
$w = new WikiPluginLoader;
$p = $w->getPlugin('ExternalSearch');
- $argstr = "url=" . $moniker; // is this the right way to pass args to a plugin?
- $searchtd = HTML::td($p->run(&$dbi, &$argstr, &$request));
+ $argstr = sprintf('url="%s"', addslashes($moniker));
+ $searchtd = HTML::td($p->run($dbi, $argstr, $request));
$tbody->pushContent(HTML::tr($monikertd, $searchtd));
@@ -97,4 +97,7 @@ extends interWikiMapPageType
// $Log$
+// Revision 1.2 2003/02/22 20:49:56 dairiki
+// Fixes for "Call-time pass by reference has been deprecated" errors.
+//
// Revision 1.1 2003/01/31 22:56:21 carstenklapp
// New plugin which provides entry forms to search any site listed in the InterWikiMap.
Index: PluginManager.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PluginManager.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -2 -b -p -d -r1.4 -r1.5
--- PluginManager.php 20 Feb 2003 18:13:38 -0000 1.4
+++ PluginManager.php 22 Feb 2003 20:49:56 -0000 1.5
@@ -49,5 +49,5 @@ extends WikiPlugin
$h = HTML();
- $this->_generatePageheader($info, &$h);
+ $this->_generatePageheader($info, $h);
if (! REQUIRE_ADMIN || $request->_user->isadmin()) {
@@ -55,7 +55,7 @@ extends WikiPlugin
$table = HTML::table(array('class' => "pagelist"));
- $this->_generateColgroups($info, &$table);
- $this->_generateColheadings($info, &$table);
- $this->_generateTableBody($info, &$dbi, &$request, &$table);
+ $this->_generateColgroups($info, $table);
+ $this->_generateColheadings($info, $table);
+ $this->_generateTableBody($info, $dbi, $request, $table);
$h->pushContent($table);
@@ -179,4 +179,7 @@ extends WikiPlugin
// $Log$
+// Revision 1.5 2003/02/22 20:49:56 dairiki
+// Fixes for "Call-time pass by reference has been deprecated" errors.
+//
// Revision 1.4 2003/02/20 18:13:38 carstenklapp
// Workaround for recent changes to WikiPlugin->getPlugin.
Index: SystemInfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/SystemInfo.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- SystemInfo.php 21 Feb 2003 23:01:11 -0000 1.6
+++ SystemInfo.php 22 Feb 2003 20:49:56 -0000 1.7
@@ -222,5 +222,5 @@ extends WikiPlugin
else
$median = $hits[$median_i];
- $stddev = stddev(&$hits, $total);
+ $stddev = stddev($hits, $total);
$s = sprintf(_("total hits: %d"), $total);
@@ -419,5 +419,5 @@ extends WikiPlugin
$desc = _($arg);
$table->pushContent(HTML::tr(HTML::td(HTML::strong($desc . ':')),
- HTML::td(HTML($this->call($arg, &$availableargs)))));
+ HTML::td(HTML($this->call($arg, $availableargs)))));
}
return $table;
@@ -425,5 +425,5 @@ extends WikiPlugin
$output = '';
foreach ($allargs as $arg) {
- $o = $this->call($arg, &$availableargs);
+ $o = $this->call($arg, $availableargs);
if (is_object($o))
return $o;
@@ -516,4 +516,7 @@ function stddev(&$hits, $total = false)
// $Log$
+// Revision 1.7 2003/02/22 20:49:56 dairiki
+// Fixes for "Call-time pass by reference has been deprecated" errors.
+//
// Revision 1.6 2003/02/21 23:01:11 dairiki
// Fixes to support new $basepage argument of WikiPlugin::run().
Index: UserPreferences.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/UserPreferences.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- UserPreferences.php 27 Aug 2002 21:51:31 -0000 1.6
+++ UserPreferences.php 22 Feb 2003 20:49:56 -0000 1.7
@@ -96,5 +96,5 @@ extends WikiPlugin
return Template('userprefs', $args);
} else {
- return $user->PrintLoginForm (&$request, $args, false, false);
+ return $user->PrintLoginForm ($request, $args, false, false);
}
}
Index: WikiAdminSelect.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WikiAdminSelect.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- WikiAdminSelect.php 18 Jan 2003 22:14:29 -0000 1.2
+++ WikiAdminSelect.php 22 Feb 2003 20:49:56 -0000 1.3
@@ -138,5 +138,5 @@ extends WikiPlugin
} elseif (empty($args['s'])) {
// List all pages to select from.
- $this->collectPages($this->_list, &$dbi);
+ $this->collectPages($this->_list, $dbi);
}
$pagelist = new PageList_Selectable($info
@@ -179,4 +179,7 @@ extends WikiPlugin
// $Log$
+// Revision 1.3 2003/02/22 20:49:56 dairiki
+// Fixes for "Call-time pass by reference has been deprecated" errors.
+//
// Revision 1.2 2003/01/18 22:14:29 carstenklapp
// Code cleanup:
|