diff options
| author | patdenice <patdenice@piwigo.org> | 2009-10-09 14:41:30 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2009-10-09 14:41:30 +0000 |
| commit | f83b8815c69383e9318e218fadcb14c59a1a0c6d (patch) | |
| tree | 9c77d445821a8a92951a50c910b69821449454f1 | |
| parent | f28bfd6bae64e8c06700cdbc9058653c7efbf1d4 (diff) | |
merge r4005 from branch 2.0 to trunk
bug 1187: set_magic_quote_runtime and get_magic_quote_gpc are depreciated and can produce notices from PHP 5.3.
Add a @ to avoid this notices.
This functions need to be removed with PHP 6
git-svn-id: http://piwigo.org/svn/trunk@4006 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/include/functions_upgrade.php | 2 | ||||
| -rw-r--r-- | include/common.inc.php | 2 | ||||
| -rw-r--r-- | install.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index 3181946eb..c7aa23873 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -136,7 +136,7 @@ function check_upgrade_access_rights($current_release, $username, $password) { global $conf, $page; - if(!get_magic_quotes_gpc()) + if(!@get_magic_quotes_gpc()) { $username = mysql_real_escape_string($username); } diff --git a/include/common.inc.php b/include/common.inc.php index 925855a19..9ec56e624 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -34,7 +34,7 @@ $t2 = $t1[1].'.'.$t2[1]; // addslashes to vars if magic_quotes_gpc is off this is a security // precaution to prevent someone trying to break out of a SQL statement. // -if( !get_magic_quotes_gpc() ) +if( !@get_magic_quotes_gpc() ) { function sanitize_mysql_kv(&$v, $k) { diff --git a/install.php b/install.php index 95ed6347e..feefc5085 100644 --- a/install.php +++ b/install.php @@ -77,7 +77,7 @@ function execute_sqlfile($filepath, $replaced, $replacing) // addslashes to vars if magic_quotes_gpc is off this is a security // precaution to prevent someone trying to break out of a SQL statement. // -if( !get_magic_quotes_gpc() ) +if( !@get_magic_quotes_gpc() ) { if( is_array($_POST) ) { |