Fixed the bugfix for #3260!

1 files changed, 9 insertions, 9 deletions

diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php
index 3c5b94013..220af866d 100644
--- a/system/database/drivers/mysql/mysql_utility.php
+++ b/system/database/drivers/mysql/mysql_utility.php
@@ -169,15 +169,6 @@ class CI_DB_mysql_utility extends CI_DB_utility {
 				$i = 0;

 				foreach ($row as $v)

 				{

-					// Do a little formatting...

-					$v = str_replace(array("\x00", "\x0a", "\x0d", "\x1a"), array('\0', '\n', '\r', '\Z'), $v);

-					$v = str_replace(array("\n", "\r", "\t"), array('\n', '\r', '\t'), $v);

-					$v = str_replace('\\', '\\\\',	$v);

-					$v = str_replace('\'', '\\\'',	$v);

-					$v = str_replace('\\\n', '\n',	$v);

-					$v = str_replace('\\\r', '\r',	$v);

-					$v = str_replace('\\\t', '\t',	$v);

-

 					// Is the value NULL?

 					if ($v === NULL)

 					{

@@ -185,6 +176,15 @@ class CI_DB_mysql_utility extends CI_DB_utility {
 					}

 					else

 					{

+						// Do a little formatting...

+						$v = str_replace(array("\x00", "\x0a", "\x0d", "\x1a"), array('\0', '\n', '\r', '\Z'), $v);

+						$v = str_replace(array("\n", "\r", "\t"), array('\n', '\r', '\t'), $v);

+						$v = str_replace('\\', '\\\\',	$v);

+						$v = str_replace('\'', '\\\'',	$v);

+						$v = str_replace('\\\n', '\n',	$v);

+						$v = str_replace('\\\r', '\r',	$v);

+						$v = str_replace('\\\t', '\t',	$v);

+

 						// Escape the data if it's not an integer

 						if ($is_int[$i] == FALSE)

 						{