Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv18035/lib
Modified Files:
PageList.php WikiGroup.php WikiPluginCached.php WikiUser.php
stdlib.php
Log Message:
Fixes for "Call-time pass by reference has been deprecated" errors.
Index: PageList.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/PageList.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -2 -b -p -d -r1.42 -r1.43
--- PageList.php 31 Oct 2002 03:28:30 -0000 1.42
+++ PageList.php 22 Feb 2003 20:49:55 -0000 1.43
@@ -49,5 +49,5 @@ class _PageList_Column_base {
return HTML::td($this->_tdattr,
HTML::raw(' '),
- $this->_getValue($page_handle, &$revision_handle),
+ $this->_getValue($page_handle, $revision_handle),
HTML::raw(' '));
}
@@ -134,5 +134,5 @@ class _PageList_Column_checkbox extends
return HTML::td($this->_tdattr,
HTML::raw(' '),
- $this->_getValue(&$pagelist, $page_handle, &$revision_handle),
+ $this->_getValue($pagelist, $page_handle, $revision_handle),
HTML::raw(' '));
}
@@ -279,5 +279,5 @@ class PageList {
$row = HTML::tr(array('class' => $class));
foreach ($this->_columns as $col)
- $row->pushContent($col->format(&$this, $page_handle, $revision_handle));
+ $row->pushContent($col->format($this, $page_handle, $revision_handle));
}
else {
Index: WikiGroup.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiGroup.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -2 -b -p -d -r1.4 -r1.5
--- WikiGroup.php 21 Jan 2003 04:02:39 -0000 1.4
+++ WikiGroup.php 22 Feb 2003 20:49:55 -0000 1.5
@@ -48,5 +48,5 @@ class WikiGroup{
* @param object $request The global WikiRequest object -- ignored.
*/
- function WikiGroup($request){
+ function WikiGroup(&$request){
return;
}
@@ -77,18 +77,18 @@ class WikiGroup{
switch(GROUP_METHOD){
case GROUP_NONE:
- return new GroupNone(&$request);
+ return new GroupNone($request);
break;
case GROUP_WIKIPAGE:
- return new GroupWikiPage(&$request);
+ return new GroupWikiPage($request);
break;
# case GROUP_DB:
-# return new GroupDB(&$user, &$request);
+# return new GroupDB($user, $request);
# break;
# case GROUP_LDAP:
-# return new GroupLDAP(&$user, &$request);
+# return new GroupLDAP($user, $request);
# break;
default:
trigger_error("No GROUP_METHOD defined", E_USER_WARNING);
- return new WikiGroup(&$request);
+ return new WikiGroup($request);
}
}
@@ -181,5 +181,5 @@ class GroupNone extends WikiGroup{
* @param object $request The global WikiRequest object - ignored.
*/
- function GroupNone($request){
+ function GroupNone(&$request){
return;
}
@@ -236,5 +236,5 @@ class GroupWikiPage extends WikiGroup{
* @param object $request The global WikiRequest object.
*/
- function GroupWikiPage($request){
+ function GroupWikiPage(&$request){
$this->request = &$request;
$this->username = null;
@@ -355,4 +355,7 @@ class GroupWikiPage extends WikiGroup{
// $Log$
+// Revision 1.5 2003/02/22 20:49:55 dairiki
+// Fixes for "Call-time pass by reference has been deprecated" errors.
+//
// Revision 1.4 2003/01/21 04:02:39 zorloc
// Added Log entry and page footer.
Index: WikiPluginCached.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiPluginCached.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -2 -b -p -d -r1.4 -r1.5
--- WikiPluginCached.php 21 Feb 2003 23:01:09 -0000 1.4
+++ WikiPluginCached.php 22 Feb 2003 20:49:55 -0000 1.5
@@ -675,5 +675,5 @@ class WikiPluginCached extends WikiPlugi
- if (!WikiPluginCached::produceImage(&$content, $plugin, $dbi, $argarray, $request, $errorformat) ) return false;
+ if (!WikiPluginCached::produceImage($content, $plugin, $dbi, $argarray, $request, $errorformat) ) return false;
$expire = $plugin->getExpire($dbi,$argarray,$request);
Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -2 -b -p -d -r1.36 -r1.37
--- WikiUser.php 21 Feb 2003 22:50:51 -0000 1.36
+++ WikiUser.php 22 Feb 2003 20:49:55 -0000 1.37
@@ -367,5 +367,5 @@ class WikiUser {
'pagename' => $this->_userid,
'content' => _('CategoryHomepage'));
- SavePage (&$this->_request, $pageinfo, false, false);
+ SavePage ($this->_request, $pageinfo, false, false);
}
$this->setPreferences($pref);
@@ -385,5 +385,5 @@ class WikiUser {
'pagename' => $pagename,
'content' => $text);
- SavePage (&$this->_request, $pageinfo, false, false);
+ SavePage ($this->_request, $pageinfo, false, false);
// create Calender
@@ -394,5 +394,5 @@ class WikiUser {
'pagename' => $pagename,
'content' => "<?plugin Calender ?>\n");
- SavePage (&$this->_request, $pageinfo, false, false);
+ SavePage ($this->_request, $pageinfo, false, false);
}
@@ -404,5 +404,5 @@ class WikiUser {
'pagename' => $pagename,
'content' => "<?plugin UserPreferences ?>\n");
- SavePage (&$this->_request, $pageinfo, false, false);
+ SavePage ($this->_request, $pageinfo, false, false);
}
}
@@ -647,4 +647,7 @@ class UserPreferences {
// $Log$
+// Revision 1.37 2003/02/22 20:49:55 dairiki
+// Fixes for "Call-time pass by reference has been deprecated" errors.
+//
// Revision 1.36 2003/02/21 22:50:51 dairiki
// Ensure that language preference is a string.
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -2 -b -p -d -r1.140 -r1.141
--- stdlib.php 21 Feb 2003 23:33:29 -0000 1.140
+++ stdlib.php 22 Feb 2003 20:49:55 -0000 1.141
@@ -989,6 +989,6 @@ function explodeList($input, $allnames,
if (preg_match('/[\?\*]/',$f)) {
reset($allnames);
- $expand = new ListRegexExpand(&$list, $glob_style ? glob_to_pcre($f) : $f, $case_sensitive);
- $expand->expandRegex($i, &$allnames);
+ $expand = new ListRegexExpand($list, $glob_style ? glob_to_pcre($f) : $f, $case_sensitive);
+ $expand->expandRegex($i, $allnames);
}
}
@@ -1007,5 +1007,5 @@ function explodePageList($input, $perm =
$allPages[] = $pagehandle->getName();
}
- return explodeList($input, &$allPages);
+ return explodeList($input, $allPages);
} else {
return explode(',',$input);
@@ -1173,4 +1173,7 @@ class Alert {
// $Log$
+// Revision 1.141 2003/02/22 20:49:55 dairiki
+// Fixes for "Call-time pass by reference has been deprecated" errors.
+//
// Revision 1.140 2003/02/21 23:33:29 dairiki
// Set alt="" on the link icon image tags.
|