[phpwiki-checkins] CVS: phpwiki/lib/plugin UserRatings.php,1.3,1.4 IncludePages.php,1.1,1.2

[Joel U. <uck...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv991/plugin

Modified Files:
	UserRatings.php IncludePages.php 
Log Message:
Fixed more passes-by-reference.


Index: UserRatings.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/UserRatings.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- UserRatings.php	7 Nov 2004 16:02:52 -0000	1.3
+++ UserRatings.php	30 Sep 2005 18:41:39 -0000	1.4
@@ -188,8 +188,8 @@ extends WikiPlugin
             if($user->allow_view_ratings($active_user))
             {
-                array_push($allowed_users_toshow, &$user);
+                array_push($allowed_users_toshow, $user);
             }
             // all users should be allowed in calculation
-            array_push($allowed_users, &$user);
+            array_push($allowed_users, $user);
             // This line ensures $user is not a reference type after this loop
             // If it is a reference type, that can produce very unexpected behavior!
@@ -206,5 +206,5 @@ extends WikiPlugin
                 $userid = $people_array['pagename']; 
                 $user = & RatingsUserFactory::getUser($userid);
-                array_push($allowed_users, &$user);
+                array_push($allowed_users, $user);
             }
             

Index: IncludePages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/IncludePages.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- IncludePages.php	6 Sep 2004 08:37:31 -0000	1.1
+++ IncludePages.php	30 Sep 2005 18:41:39 -0000	1.2
@@ -75,5 +75,5 @@ extends WikiPlugin_IncludePage
     	foreach ($args['pages'] as $page) {
             if (empty($args['exclude']) or !in_array($page, $args['exclude'])) {
-                $html = HTML($html, $include->run($dbi, "page='$page' ".$argstr, &$request, $basepage));
+                $html = HTML($html, $include->run($dbi, "page='$page' ".$argstr, $request, $basepage));
             }
     	}
@@ -83,4 +83,7 @@ extends WikiPlugin_IncludePage
 
 // $Log$
+// Revision 1.2  2005/09/30 18:41:39  uckelman
+// Fixed more passes-by-reference.
+//
 // Revision 1.1  2004/09/06 08:37:31  rurban
 // plugin-list support for pages and exclude args