* @return string Output string
*/
protected function parseStripslashes($str) {
- $search = array('\\\\', '\\\'', '\\"', '\\0', '\\n', '\\r', '\\Z');
- $replace = array('\\', '\'', '"', '\0', '
-', '\r', '\1a');
+ $search = array('\\\\', '\\\'', '\\"', '\0', '\n', '\r', '\Z');
+ $replace = array('\\', '\'', '"', "\x00", "\x0a", "\x0d", "\x1a");
+
return str_replace($search, $replace, $str);
}
* @return string Output string
*/
protected function compileAddslashes($str) {
- $search = array('\\', '\'', '"', '\0', '
-', '\r', '\1a');
- $replace = array('\\\\', '\\\'', '\\"', '\\0', '\\n', '\\r', '\\Z');
+ $search = array('\\', '\'', '"', "\x00", "\x0a", "\x0d", "\x1a");
+ $replace = array('\\\\', '\\\'', '\\"', '\0', '\n', '\r', '\Z');
+
return str_replace($search, $replace, $str);
}
* @return string Output string
*/
protected function trimSQL($str) {
- return trim(rtrim($str, '; \r
+ return trim(rtrim($str, ';
')) . ' ';
}
$str1 = $str;
$str2 = $newStr;
}
- // Fixing escaped chars:
- $search = array('\\0', '\\n', '\\r', '\\Z');
- $replace = array('\0', '
-', '\r', '\1a');
+
+ // Fixing escaped chars:
+ $search = array('\0', '\n', '\r', '\Z');
+ $replace = array("\x00", "\x0a", "\x0d", "\x1a");
$str1 = str_replace($search, $replace, $str1);
$str2 = str_replace($search, $replace, $str2);
+
if (strcmp(str_replace(array(' ', TAB, CR, LF), '', $this->trimSQL($str1)), str_replace(array(' ', TAB, CR, LF), '', $this->trimSQL($str2)))) {
return array(
str_replace(array(' ', TAB, CR, LF), ' ', $str),
- str_replace(array(' ', TAB, CR, LF), ' ', $newStr)
+ str_replace(array(' ', TAB, CR, LF), ' ', $newStr),
);
}
}