From ddc232e6d4b203b2d230a220d820001f8ce04983 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 29 Jan 2006 22:15:32 +0000
Subject: [PATCH] Removing the binary switch from ISSO::escape()

---
 dev/changes.txt |  3 ++-
 kernel.php      | 21 +++------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/dev/changes.txt b/dev/changes.txt
index 8e9b2a8..5118148 100644
--- a/dev/changes.txt
+++ b/dev/changes.txt
@@ -32,4 +32,5 @@ CHANGELOG FOR 2.0
 - Objects no longer use $_isso as a call back, but rather $this->registry (in objects) or $GLOBALS['isso:callback'] (in global scope)
 - Added explain_error_reporting() so you can get an overview of all the constants and if they're enabled [kernel.php]
 - Added transaction capabilities to database layers
-- The mail module now supports multiple recipients and HTML multiparts
\ No newline at end of file
+- The mail module now supports multiple recipients and HTML multiparts [mail.php]
+- ISSO::escape() no longer has a binary option [kernel.php]
\ No newline at end of file
diff --git a/kernel.php b/kernel.php
index b91b1b6..d8787bb 100644
--- a/kernel.php
+++ b/kernel.php
@@ -938,25 +938,17 @@ class ISSO
 	* @access	public
 	*
 	* @param	string	Some string
-	* @param	bool	If the data is binary; if so it'll be run through DB::escape_stringing()
 	* @param	bool	Force magic quotes to be off
 	*
 	* @return	string	String that has slashes added
 	*/
-	function escape($str, $binary = false, $force = true)
+	function escape($str, $force = true)
 	{
 		if ($this->magicquotes AND !$force)
 		{
 			if (isset($this->modules[ISSO_DB_LAYER]))
 			{
-				if ($binary)
-				{
-					return $this->modules[ISSO_DB_LAYER]->escape_binary(str_replace(array("\'", '\"'), array("'", '"'), $str));
-				}
-				else
-				{
-					return $this->modules[ISSO_DB_LAYER]->escape_string(str_replace(array("\'", '\"'), array("'", '"'), $str));
-				}
+				return $this->modules[ISSO_DB_LAYER]->escape_string(str_replace(array("\'", '\"'), array("'", '"'), $str));
 			}
 			return $str;
 		}
@@ -964,14 +956,7 @@ class ISSO
 		{
 			if (isset($this->modules[ISSO_DB_LAYER]))
 			{
-				if ($binary)
-				{
-					return $this->modules[ISSO_DB_LAYER]->escape_binary($str);
-				}
-				else
-				{
-					return $this->modules[ISSO_DB_LAYER]->escape_string($str);
-				}
+				return $this->modules[ISSO_DB_LAYER]->escape_string($str);
 			}
 			return addslashes($str);
 		}
-- 
2.22.5