Functions should return by value, not by reference - unless specifically returning a reference to a singleton object

11 files changed, 20 insertions, 20 deletions

diff --git a/includes/classes/class_family.php b/includes/classes/class_family.php
index 604e325335..c736b58ea8 100644
--- a/includes/classes/class_family.php
+++ b/includes/classes/class_family.php
@@ -145,7 +145,7 @@ class Family extends GedcomRecord {
 	 * @param string $pid
 	 * @return string
 	 */
-	function &getSpouseId($pid) {
+	function getSpouseId($pid) {
 		if (is_null($this->wife) or is_null($this->husb)) return null;
 		if ($this->wife->getXref()==$pid) return $this->husb->getXref();
 		if ($this->husb->getXref()==$pid) return $this->wife->getXref();
@@ -216,7 +216,7 @@ class Family extends GedcomRecord {
 	 * If there is an updated family record in the gedcom file
 	 * return a new family object for it
 	 */
-	function &getUpdatedFamily() {
+	function getUpdatedFamily() {
 		if ($this->getChanged()) {
 			return $this;
 		}
diff --git a/includes/classes/class_gedcomrecord.php b/includes/classes/class_gedcomrecord.php
index 57e9e76ae3..8a1bca3f5a 100644
--- a/includes/classes/class_gedcomrecord.php
+++ b/includes/classes/class_gedcomrecord.php
@@ -728,7 +728,7 @@ class GedcomRecord {
 	* @param string $fact
 	* @return Event
 	*/
-	public function &getFactByType($factType) {
+	public function getFactByType($factType) {
 		$this->parseFacts();
 		if (empty($this->facts)) {
 			return null;
diff --git a/includes/classes/class_localclient.php b/includes/classes/class_localclient.php
index 038df824e2..752ab3247e 100644
--- a/includes/classes/class_localclient.php
+++ b/includes/classes/class_localclient.php
@@ -101,7 +101,7 @@ class LocalClient extends ServiceClient {
 	 * @param integer $start - the start index of the results to return
 	 * @param integer $max - the maximum number of results to return
 	 */
-	function &search($query, $start=0, $max=100) {
+	function search($query, $start=0, $max=100) {
 		//$this->authenticate();
 		//$result = $this->soapClient->search($this->SID, $query, $start, $max);
 		$search_results = search_indis(array($query), array($this->gedfile), 'AND', true);
diff --git a/includes/classes/class_person.php b/includes/classes/class_person.php
index f404aeabf3..d9a4065025 100644
--- a/includes/classes/class_person.php
+++ b/includes/classes/class_person.php
@@ -819,7 +819,7 @@ class Person extends GedcomRecord {
 	* return a new person object for it
 	* @return Person
 	*/
-	function &getUpdatedPerson() {
+	function getUpdatedPerson() {
 		if ($this->getChanged()) {
 			return null;
 		}
diff --git a/includes/classes/class_serviceclient.php b/includes/classes/class_serviceclient.php
index f14c33d646..a323e12f7f 100644
--- a/includes/classes/class_serviceclient.php
+++ b/includes/classes/class_serviceclient.php
@@ -854,7 +854,7 @@ class ServiceClient extends GedcomRecord {
 	* @param integer $start - the start index of the results to return
 	* @param integer $max - the maximum number of results to return
 	*/
-	function &search($query, $start=0, $max=100) {
+	function search($query, $start=0, $max=100) {
 		$this->authenticate();
 		$result = $this->soapClient->search($this->SID, $query, $start, $max);
 		return $result;
diff --git a/includes/controllers/family_ctrl.php b/includes/controllers/family_ctrl.php
index 3d7d2540f4..8ff2987e2e 100644
--- a/includes/controllers/family_ctrl.php
+++ b/includes/controllers/family_ctrl.php
@@ -214,7 +214,7 @@ class FamilyRoot extends BaseController {
 	* get the family page charts menu
 	* @return Menu
 	*/
-	function &getChartsMenu() {
+	function getChartsMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
 		else $ff="";
@@ -293,7 +293,7 @@ class FamilyRoot extends BaseController {
 	* @deprecated This function has been deprecated by the getReportsMenu function in menu.php
 	* @return Menu
 	*/
-	function &getReportsMenu() {
+	function getReportsMenu() {
 	/**
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
@@ -320,7 +320,7 @@ class FamilyRoot extends BaseController {
 	/**
 	* get the family page edit menu
 	*/
-	function &getEditMenu() {
+	function getEditMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
 		global $SHOW_GEDCOM_RECORD;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
@@ -449,7 +449,7 @@ class FamilyRoot extends BaseController {
 	* get the other menu
 	* @return Menu
 	*/
-	function &getOtherMenu() {
+	function getOtherMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php
index d8b3779a4b..3923f1d6eb 100644
--- a/includes/controllers/individual_ctrl.php
+++ b/includes/controllers/individual_ctrl.php
@@ -530,7 +530,7 @@ class IndividualControllerRoot extends BaseController {
 	* get the edit menu
 	* @return Menu
 	*/
-	function &getEditMenu() {
+	function getEditMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
 		global $USE_QUICK_UPDATE;
 		if ($TEXT_DIRECTION=="rtl") {
@@ -638,7 +638,7 @@ class IndividualControllerRoot extends BaseController {
 	* get the "other" menu
 	* @return Menu
 	*/
-	function &getOtherMenu() {
+	function getOtherMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
 		global $SHOW_GEDCOM_RECORD;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
diff --git a/includes/controllers/media_ctrl.php b/includes/controllers/media_ctrl.php
index dad7804617..8788090eb0 100644
--- a/includes/controllers/media_ctrl.php
+++ b/includes/controllers/media_ctrl.php
@@ -180,7 +180,7 @@ class MediaControllerRoot extends IndividualController{
 	* get the edit menu
 	* @return Menu
 	*/
-	function &getEditMenu() {
+	function getEditMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $TOTAL_NAMES;
 		global $NAME_LINENUM, $SEX_LINENUM;
 		global $SHOW_GEDCOM_RECORD;
@@ -296,7 +296,7 @@ class MediaControllerRoot extends IndividualController{
 	* get the "other" menu
 	* @return Menu
 	*/
-	function &getOtherMenu() {
+	function getOtherMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $THEME_DIR, $SHOW_GEDCOM_RECORD;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
diff --git a/includes/controllers/note_ctrl.php b/includes/controllers/note_ctrl.php
index 9d432c55b2..c55954fc4d 100644
--- a/includes/controllers/note_ctrl.php
+++ b/includes/controllers/note_ctrl.php
@@ -171,7 +171,7 @@ class NoteControllerRoot extends BaseController {
 	* get edit menut
 	* @return Menu
 	*/
-	function &getEditMenu() {
+	function getEditMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
 		global $SHOW_GEDCOM_RECORD;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
@@ -254,7 +254,7 @@ class NoteControllerRoot extends BaseController {
 	* get the other menu
 	* @return Menu
 	*/
-	function &getOtherMenu() {
+	function getOtherMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
diff --git a/includes/controllers/repository_ctrl.php b/includes/controllers/repository_ctrl.php
index 0427d5209b..e019293fc1 100644
--- a/includes/controllers/repository_ctrl.php
+++ b/includes/controllers/repository_ctrl.php
@@ -168,7 +168,7 @@ class RepositoryControllerRoot extends BaseController {
 	* get edit menut
 	* @return Menu
 	*/
-	function &getEditMenu() {
+	function getEditMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
 		global $SHOW_GEDCOM_RECORD;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
@@ -255,7 +255,7 @@ class RepositoryControllerRoot extends BaseController {
 	* get the other menu
 	* @return Menu
 	*/
-	function &getOtherMenu() {
+	function getOtherMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
diff --git a/includes/controllers/source_ctrl.php b/includes/controllers/source_ctrl.php
index fe4de22cef..c264e780de 100644
--- a/includes/controllers/source_ctrl.php
+++ b/includes/controllers/source_ctrl.php
@@ -168,7 +168,7 @@ class SourceControllerRoot extends BaseController {
 	* get edit menut
 	* @return Menu
 	*/
-	function &getEditMenu() {
+	function getEditMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
 		global $SHOW_GEDCOM_RECORD;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
@@ -262,7 +262,7 @@ class SourceControllerRoot extends BaseController {
 	* get the other menu
 	* @return Menu
 	*/
-	function &getOtherMenu() {
+	function getOtherMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";