diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-11-03 07:44:33 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-11-03 07:44:33 +0000 |
| commit | b9ff37b34c79c41f047c4e0683429b930090117e (patch) | |
| tree | e210d4956eec9bf450b12965718ce83fd01518a8 | |
| parent | 537f44864785f0cbdb1c8defdc84b9e2093e3f57 (diff) | |
Handle magic_quotes on runtime and remove them from the requirements list (#1485285)
git-svn-id: https://svn.roundcube.net/trunk@2029 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/INSTALL | 2 | ||||
| -rw-r--r-- | roundcubemail/installer/welcome.html | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/main.inc | 5 |
3 files changed, 4 insertions, 4 deletions
diff --git a/roundcubemail/INSTALL b/roundcubemail/INSTALL index 2a68dc8d6..0c3b05dee 100644 --- a/roundcubemail/INSTALL +++ b/roundcubemail/INSTALL @@ -21,8 +21,6 @@ REQUIREMENTS - memory_limit (increase as suitable to support large attachments) - file_uploads enabled (for attachment upload features) - session.auto_start disabled - - magic_quotes_gpc disabled - - magic_quotes_sybase disabled - zend.ze1_compatibility_mode disabled * PHP compiled with OpenSSL to connect to IMAPS and to use the spell checker * A MySQL or PostgreSQL database engine or the SQLite extension for PHP diff --git a/roundcubemail/installer/welcome.html b/roundcubemail/installer/welcome.html index bfec23337..0c6805a11 100644 --- a/roundcubemail/installer/welcome.html +++ b/roundcubemail/installer/welcome.html @@ -22,7 +22,6 @@ <li>error_reporting E_ALL & ~E_NOTICE (or lower)</li> <li>file_uploads on (for attachment upload features)</li> <li>session.auto_start needs to be off</li> - <li>magic_quotes_gpc off</li> </ul> </li> <li>A MySQL or PostgreSQL database engine or the SQLite extension for PHP</li> diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 8eb2c81f5..4ed25afaf 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -420,8 +420,11 @@ function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL) $value = $_COOKIE[$fname]; } + // strip single quotes if magic_quotes_sybase is enabled + if (ini_get('magic_quotes_sybase')) + $value = str_replace("''", "'", $value); // strip slashes if magic_quotes enabled - if ((bool)get_magic_quotes_gpc()) + else if (get_magic_quotes_gpc() || get_magic_quotes_runtime()) $value = stripslashes($value); // remove HTML tags if not allowed |