Merge pull request #490 from narfbg/ci-issue-467
Fix issue #467 - suppress warnings generated from get_magic_quotes_gpc()
diff --git a/system/core/Input.php b/system/core/Input.php
index f39371f..6f84421 100755
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -555,7 +555,7 @@
}
// 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 0afdbe4..6b4e83c 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -134,6 +134,7 @@
<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>