projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Temporary fixes for php encoding library bugs ending with segfault.
[fa-stable.git]
/
includes
/
db
/
connect_db_mysqli.inc
diff --git
a/includes/db/connect_db_mysqli.inc
b/includes/db/connect_db_mysqli.inc
index 48b57402df0d1e68696f2273112d69f358cac9f9..a70e5926b12f839fcc6263d4ab50208f514241fc 100644
(file)
--- a/
includes/db/connect_db_mysqli.inc
+++ b/
includes/db/connect_db_mysqli.inc
@@
-135,8
+135,8
@@
function db_num_fields($result)
function db_escape($value = "", $nullify = false)
{
global $db;
function db_escape($value = "", $nullify = false)
{
global $db;
-
- $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
+
+ $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding
=='iso-8859-2' ? 'ISO-8859-1' : $_SESSION['language']->encoding
);
$value = html_specials_encode($value);
//reset default if second parameter is skipped
$value = html_specials_encode($value);
//reset default if second parameter is skipped