Merge remote branch 'origin/xorg/maint' into xorg/master

[platal.git] / modules / profile / general.inc.php

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index ac797c6..8a03a47 100644 (file)
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -41,7 +41,7 @@ class ProfileSettingSearchNames implements ProfileSetting
         return name_to_basename($value);
     }
 
-    private function prepare(ProfilePage &$page, $field, $value, $init, &$success)
+    private function prepare(ProfilePage $page, $field, $value, $init, &$success)
     {
         $success = true;
         $ini     = $this->prepareField($init);
@@ -78,7 +78,7 @@ class ProfileSettingSearchNames implements ProfileSetting
         return $value;
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $success     = true;
         $success_tmp = true;
@@ -207,7 +207,7 @@ class ProfileSettingSearchNames implements ProfileSetting
         return $value;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
         require_once 'name.func.inc.php';
 
@@ -258,7 +258,7 @@ class ProfileSettingEdu implements ProfileSetting
         return ($a < $b) ? -1 : 1;
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $success = true;
         if (is_null($value)) {
@@ -293,7 +293,7 @@ class ProfileSettingEdu implements ProfileSetting
         return $value;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
         XDB::execute("DELETE FROM  profile_education
                             WHERE  pid = {?} AND !FIND_IN_SET('primary', flags)",
@@ -349,9 +349,9 @@ class ProfileSettingEdu implements ProfileSetting
 class ProfileSettingEmailDirectory implements ProfileSetting
 {
     public function __construct(){}
-    public function save(ProfilePage &$page, $field, $value){}
+    public function save(ProfilePage $page, $field, $value){}
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $p = Platal::page();
 
@@ -390,7 +390,7 @@ class ProfileSettingNetworking implements ProfileSetting
         $this->number = new ProfileSettingNumber();
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         if (is_null($value)) {
             $value = XDB::fetchAllAssoc("SELECT  n.address, n.pub, n.nwid AS type
@@ -431,7 +431,7 @@ class ProfileSettingNetworking implements ProfileSetting
         return $value;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
         XDB::execute("DELETE FROM profile_networking
                             WHERE pid = {?}",
@@ -461,7 +461,7 @@ class ProfileSettingPromo implements ProfileSetting
 {
     public function __construct(){}
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
         $gradYearNew = $value;
         if ($page->profile->mainEducation() == 'X') {
@@ -486,7 +486,7 @@ class ProfileSettingPromo implements ProfileSetting
         }
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $entryYear = $page->profile->entry_year;
         $gradYear  = $page->profile->grad_year;
@@ -537,7 +537,7 @@ class ProfilePageGeneral extends ProfilePage
 {
     protected $pg_template = 'profile/general.tpl';
 
-    public function __construct(PlWizard &$wiz)
+    public function __construct(PlWizard $wiz)
     {
         parent::__construct($wiz);
         $this->settings['search_names']
@@ -707,7 +707,7 @@ class ProfilePageGeneral extends ProfilePage
         }
     }
 
-    public function _prepare(PlPage &$page, $id)
+    public function _prepare(PlPage $page, $id)
     {
         require_once "education.func.inc.php";