From 2408cc5c69209350a350246e260de494720eb773 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 18 Apr 2011 18:47:17 +0000
Subject: Fixes #2046. Applied Franz' patch for sanitize_int().

git-svn-id: http://code.elgg.org/elgg/trunk@9004 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/database.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'engine/lib/database.php')

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);
 }
 
 /**
-- 
cgit v1.2.3