From: Roland Mas <lolando@debian.org>
Date: Tue, 22 Nov 2011 16:19:27 +0000 (+0000)
Subject: Merged from Evolvis via 5.1: make {set,delete}Preference method’s return value actual... 
X-Git-Tag: v5_2_rc1~379
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=4517642c1737047c849d95a1113c500e969072ae

Merged from Evolvis via 5.1: make {set,delete}Preference method’s return value actually match its docs
---

diff --git a/src/common/include/User.class.php b/src/common/include/User.class.php
index 048fb40e34..3d6854c73e 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -1242,7 +1242,7 @@ Enjoy the site.
 		$res = db_query_params('DELETE FROM user_preferences WHERE user_id=$1 AND preference_name=$2',
 					array ($this->getID(),
 					       $preference_name));
-		return $res;
+		return ((!$res || db_affected_rows($res) < 1) ? false : true);
 	}
 
 	/**
@@ -1273,9 +1273,9 @@ Enjoy the site.
 								  $preference_name,
 								  $value,
 								  time())) ;
-				return $result;
 			}
 		}
+		return ((!$result || db_affected_rows($result) < 1) ? false : true);
 	}
 
 	/**
diff --git a/src/www/pm/postuploadcsv.php b/src/www/pm/postuploadcsv.php
index b2f2c31964..8e01c7e7b2 100644
--- a/src/www/pm/postuploadcsv.php
+++ b/src/www/pm/postuploadcsv.php
@@ -108,15 +108,14 @@ if (isset($input_file) && isset($input_file['tmp_name']) &&
 					'notes'=>$cols[11]);
 		}
 		$res=&pm_import_tasks($group_project_id, $tasks);
-
-	} else {
-		$res['errormessage'] = 'Parameter error';
 	}
+} else {
+	$res['errormessage'] = 'Parameter error';
+}
 
-	if ($res['success']) {
-		$feedback .= 'Import Was Successful';
-	} else {
-		$error_msg .= $res['errormessage'];
-	}
+if ($res['success']) {
+	$feedback .= 'Import Was Successful';
+} else {
+	$error_msg .= $res['errormessage'];
 }
 ?>