diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-24 18:01:04 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-24 18:01:04 +0200 |
| commit | c19bb42eaff9e4ed9aa2cda44fe85b4cb2f9f62d (patch) | |
| tree | 01c9450dcdaf0cb440a33175c28d0fae260583ea | |
| parent | abe8b78b65633b6942f57afbd263c7207821696b (diff) | |
| parent | 4f27b5b93090e483d73a8be0dbb4587309ed3686 (diff) | |
Merge pull request #490 from narfbg/ci-issue-467
Fix issue #467 - suppress warnings generated from get_magic_quotes_gpc()
| -rwxr-xr-x | system/core/Input.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index f39371fb0..6f8442107 100755 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -555,7 +555,7 @@ class CI_Input { } // We strip slashes if magic quotes is on to keep things consistent - if (function_exists('get_magic_quotes_gpc') AND get_magic_quotes_gpc()) + if (function_exists('get_magic_quotes_gpc') AND @get_magic_quotes_gpc()) { $str = stripslashes($str); } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0afdbe4a1..6b4e83c2f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -134,6 +134,7 @@ Change Log <li>Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called.</li> <li>Fixed a bug (#82) - WHERE clause field names in the DB <samp>update_string()</samp> method were not escaped, resulting in failed queries in some cases.</li> <li>Fixed a bug (#89) - Fix a variable type mismatch in DB <samp>display_error()</samp> where an array is expected, but a string could be set instead.</li> + <li>Fixed a bug (#467) - Suppress warnings generated from get_magic_quotes_gpc() (deprecated in PHP 5.4)</li> </ul> <h2>Version 2.0.3</h2> |