From 707df9db27cf2154910978427b9844448bcf931a Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Mon, 4 Feb 2013 20:51:07 -0500
Subject: Small changes to remove static analysis noise and simplify flow

---
 engine/lib/upgrades/create_upgrade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engine/lib/upgrades/create_upgrade.php')

diff --git a/engine/lib/upgrades/create_upgrade.php b/engine/lib/upgrades/create_upgrade.php
index 3652e18a2..f0fa9b594 100644
--- a/engine/lib/upgrades/create_upgrade.php
+++ b/engine/lib/upgrades/create_upgrade.php
@@ -93,7 +93,7 @@ if (!$h) {
 	die("Could not open file $upgrade_file");
 }
 
-if (!fputs($h, $upgrade_code)) {
+if (!fwrite($h, $upgrade_code)) {
 	die("Could not write to $upgrade_file");
 } else {
 	elgg_set_version_dot_php_version($upgrade_version);
@@ -130,6 +130,7 @@ function elgg_set_version_dot_php_version($version) {
 
 	fputs($h, $out);
 	fclose($h);
+	return true;
 }
 
 /**
-- 
cgit v1.2.3


From f416d7ba66000d485260a8e63962541afa248320 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 9 Feb 2013 08:01:12 -0500
Subject: small changes to previous commit from Steve's cleanup

---
 engine/lib/sessions.php                | 2 +-
 engine/lib/upgrades/create_upgrade.php | 2 +-
 engine/lib/users.php                   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'engine/lib/upgrades/create_upgrade.php')

diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
index eb451f05a..3dd95aa2f 100644
--- a/engine/lib/sessions.php
+++ b/engine/lib/sessions.php
@@ -616,7 +616,7 @@ function _elgg_session_destroy($id) {
 		global $sess_save_path;
 
 		$sess_file = "$sess_save_path/sess_$id";
-		return (@unlink($sess_file));
+		return @unlink($sess_file);
 	}
 
 	return false;
diff --git a/engine/lib/upgrades/create_upgrade.php b/engine/lib/upgrades/create_upgrade.php
index f0fa9b594..b34f31b7e 100644
--- a/engine/lib/upgrades/create_upgrade.php
+++ b/engine/lib/upgrades/create_upgrade.php
@@ -128,7 +128,7 @@ function elgg_set_version_dot_php_version($version) {
 
 	rewind($h);
 
-	fputs($h, $out);
+	fwrite($h, $out);
 	fclose($h);
 	return true;
 }
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 7a6245261..7365a6b68 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1201,14 +1201,13 @@ function set_last_login($user_guid) {
  * @param string   $object_type user
  * @param ElggUser $object      User object
  *
- * @return bool
+ * @return void
  * @access private
  */
 function user_create_hook_add_site_relationship($event, $object_type, $object) {
 	global $CONFIG;
 
 	add_entity_relationship($object->getGUID(), 'member_of_site', elgg_get_site_entity()->guid);
-	return true;
 }
 
 /**
-- 
cgit v1.2.3