Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 10 insertions, 11 deletions

diff --git a/engine/lib/private_settings.php b/engine/lib/private_settings.php
index e5e7b2213..386af5279 100644
--- a/engine/lib/private_settings.php
+++ b/engine/lib/private_settings.php
@@ -38,7 +38,7 @@
  *                                     their own settings.
  *
  *
- * @return array
+ * @return mixed int If count, int. If not count, array. false on errors.
  * @since 1.8.0
  */
 function elgg_get_entities_from_private_settings(array $options = array()) {
@@ -95,6 +95,7 @@ function elgg_get_entities_from_private_settings(array $options = array()) {
  * @param string     $name_prefix   A string to prefix all names with
  * @return array
  * @since 1.8.0
+ * @access private
  */
 function elgg_get_entity_private_settings_where_sql($table, $names = NULL, $values = NULL,
 $pairs = NULL, $pair_operator = 'AND', $name_prefix = '') {
@@ -334,7 +335,7 @@ function get_all_private_settings($entity_guid) {
  * @param string $name        The name of the setting
  * @param string $value       The value of the setting
  *
- * @return mixed The setting ID, or false on failure
+ * @return bool
  * @see get_private_setting()
  * @see get_all_private_settings()
  * @see remove_private_setting()
@@ -357,10 +358,8 @@ function set_private_setting($entity_guid, $name, $value) {
 		(entity_guid, name, value) VALUES
 		($entity_guid, '$name', '$value')
 		ON DUPLICATE KEY UPDATE value='$value'");
-	if ($result === 0) {
-		return true;
-	}
-	return $result;
+
+	return $result !== false;
 }
 
 /**
@@ -369,7 +368,7 @@ function set_private_setting($entity_guid, $name, $value) {
  * @param int    $entity_guid The Entity GUID
  * @param string $name        The name of the setting
  *
- * @return true|false depending on success
+ * @return bool
  * @see get_private_setting()
  * @see get_all_private_settings()
  * @see set_private_setting()
@@ -389,8 +388,8 @@ function remove_private_setting($entity_guid, $name) {
 	$name = sanitise_string($name);
 
 	return delete_data("DELETE from {$CONFIG->dbprefix}private_settings
-		where name = '{$name}'
-		and entity_guid = {$entity_guid}");
+		WHERE name = '{$name}'
+		AND entity_guid = {$entity_guid}");
 }
 
 /**
@@ -398,7 +397,7 @@ function remove_private_setting($entity_guid, $name) {
  *
  * @param int $entity_guid The Entity GUID
  *
- * @return true|false depending on success
+ * @return bool
  * @see get_private_setting()
  * @see get_all_private_settings()
  * @see set_private_setting()
@@ -416,5 +415,5 @@ function remove_all_private_settings($entity_guid) {
 	}
 
 	return delete_data("DELETE from {$CONFIG->dbprefix}private_settings
-		where entity_guid = {$entity_guid}");
+		WHERE entity_guid = {$entity_guid}");
 }