summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-11-21 17:45:44 -0500
committerSolomon Peachy <pizza@shaftnet.org>2020-11-21 17:45:44 -0500
commitfaa56c1cbc45c108ca0c156b7ff6ba5f4c774691 (patch)
treefd9da512affffeecb48a3b013dbf2a2f4991e621
parentcb062e4e0a8f15114ba1df855f179aa37082a71b (diff)
downloadpo-faa56c1cbc45c108ca0c156b7ff6ba5f4c774691.tar.gz
po-faa56c1cbc45c108ca0c156b7ff6ba5f4c774691.tar.bz2
po-faa56c1cbc45c108ca0c156b7ff6ba5f4c774691.zip
We now require PHP 5.4 or newer.
(specifically, we have to drop support for magic_quotes_gpc)
-rw-r--r--CHANGES1
-rw-r--r--src/include/site.php19
-rw-r--r--src/install.php4
3 files changed, 5 insertions, 19 deletions
diff --git a/CHANGES b/CHANGES
index 1706d10..b50a0c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -45,6 +45,7 @@ v2.38 (Unreleased)
[misc] Directly store the 'iso' value instead of an enumerated list
[fix] PHP7-related error when importing images with an XMP/RDF 'Subject' tag
[fix] Use hash of various parameters for scaled image filenames
+ [fix] Get rid of support for magic_quotes_gpc; This means we now require PHP 5.4 or newer!
v2.37.1 (December 3, 2012)
diff --git a/src/include/site.php b/src/include/site.php
index 78c547d..427a313 100644
--- a/src/include/site.php
+++ b/src/include/site.php
@@ -60,25 +60,10 @@ function site_prolog($min_type = PO_USER_TYPE_DISABLED) {
global $site_url;
$sybase = FALSE;
- // if magic quotes is enabled
- if ( get_magic_quotes_gpc () ) {
- // workaround because magic_quotes does not change $_SERVER['argv']
- $argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : NULL;
-
- // fix all affected arrays
- foreach ( array ('_ENV', '_REQUEST', '_GET', '_POST', '_COOKIE', '_SERVER') as $var ) {
- $GLOBALS[$var] = fix_magic_quotes ($GLOBALS[$var], $sybase);
- }
- $_SERVER['argv'] = $argv;
-
- // turn off magic quotes, this is so scripts which
- // are sensitive to the setting will work correctly
- ini_set ('magic_quotes_gpc', 0);
- }
-
+
/* Turn off error display */
ini_set ('display_errors', 0);
-
+
/* Establish DB Connection */
$database = po_dbconnect();
diff --git a/src/install.php b/src/install.php
index ac381d1..524d9d9 100644
--- a/src/install.php
+++ b/src/install.php
@@ -965,8 +965,8 @@ if (!$install_enabled) {
}
$x = phpversion();
-if ($x < "5.0") {
- print "<h3>You are running PHP $x but Photo Organizer needs PHP >= 5.0</h3>\n";
+if ($x < "5.4") {
+ print "<h3>You are running PHP $x but Photo Organizer needs PHP >= 5.4</h3>\n";
$go = 0;
}