Fix PHP warnings (return by ref, protected/private)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>

diff --git a/core b/core
index 24bb393..54d6549 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 24bb393609c4e87e8578ddaca906c32d99a299bf
+Subproject commit 54d6549cad8056b1f0656b2d8fc83a853631758e

diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php
index e76b830..92e0841 100644 (file)
--- a/include/ufbuilder.inc.php
+++ b/include/ufbuilder.inc.php
@@ -87,7 +87,7 @@ class UserFilterBuilder
     /** Returns the built UFC
      * @return The UFC, or PFC_False() if an error happened
      */
-    public function &getUFC()
+    public function getUFC()
     {
         $this->buildUFC();
         if ($this->valid) {

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 92a5531..0aefe1f 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -49,7 +49,6 @@ class SearchSet extends ProfileSet
 {
     public  $advanced = false;
     private $score    = null;
-    private $conds    = null;
     private $quick    = false;
 
     public function __construct($quick = false, $no_search = false, PlFilterCondition $cond = null)
@@ -90,7 +89,8 @@ class SearchSet extends ProfileSet
             return;
         }
 
-        $this->conds->addChild($ufb->getUFC());
+        $ufc = $ufb->getUFC();
+        $this->conds->addChild($ufc);
 
         $orders = $ufb->getOrders();
         $orders[] = new UFO_Promo(UserFilter::DISPLAY, true);