summaryrefslogtreecommitdiffstats
path: root/lib/general.lib.php
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2012-07-01 22:30:32 -0400
committerPaul Arthur <paul.arthur@flowerysong.com>2012-07-01 22:30:32 -0400
commit4ea8af496871385e5c9c37b15ed71f133cf99a29 (patch)
tree0e87381e2380839d6e0236fe7b7779e9df2a7efe /lib/general.lib.php
parent567b27954b34906d23ad4f71b93533d78c40311f (diff)
downloadampache-4ea8af496871385e5c9c37b15ed71f133cf99a29.tar.gz
ampache-4ea8af496871385e5c9c37b15ed71f133cf99a29.tar.bz2
ampache-4ea8af496871385e5c9c37b15ed71f133cf99a29.zip
Remove more code that only ran on PHP <5.3
Diffstat (limited to 'lib/general.lib.php')
-rw-r--r--lib/general.lib.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/general.lib.php b/lib/general.lib.php
index d3bf8d02..e913431e 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -94,14 +94,7 @@ function scrub_in($input) {
*/
function scrub_out($string) {
- //This feature has been DEPRECATED as of PHP 5.3.0
- if(version_compare(PHP_VERSION, '5.3.0', '<=') AND ini_get('magic_quotes_gpc') != 'Off') {
- $string = stripslashes($string);
- }
-
- $string = htmlentities($string, ENT_QUOTES, Config::get('site_charset'));
-
- return $string;
+ return htmlentities($string, ENT_QUOTES, Config::get('site_charset'));
} // scrub_out