Merge branch 'master' of github.com:Elgg/Elgg

1 files changed, 15 insertions, 6 deletions

diff --git a/engine/lib/database.php b/engine/lib/database.php
index a9c4017a0..6b1b494b9 100644
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -680,22 +680,31 @@ function sanitize_string($string) {
  * Sanitises an integer for database use.
  *
  * @param int $int Integer
- *
+ * @param bool[optional] $signed Whether negative values should be allowed (true)
  * @return int Sanitised integer
  */
-function sanitise_int($int) {
+function sanitise_int($int, $signed = true) {
+	$int = (int) $int;
+
+	if ($signed === false) {
+		if ($int < 0) {
+			$int = 0;
+		}
+	}
+
 	return (int) $int;
 }
 
 /**
- * Wrapper function for alternate English spelling
+ * Sanitises an integer for database use.
+ * Wrapper function for alternate English spelling (@see sanitise_int)
  *
  * @param int $int Integer
- *
+ * @param bool[optional] $signed Whether negative values should be allowed (true)
  * @return int Sanitised integer
  */
-function sanitize_int($int) {
-	return (int) $int;
+function sanitize_int($int, $signed = true) {
+	return sanitise_int($int, $signed);
 }
 
 /**