Skip to content

Make restore.php PHP 7.4 compatible #25801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 5 commits into from
Oct 28, 2019
Merged

Make restore.php PHP 7.4 compatible #25801

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03fd9a3
Make restore.php PHP 7.4 compatible
alikon Aug 9, 2019
6001213
Add note about modification to the header
richard67 Aug 9, 2019
e29ec35
Merge pull request #59 from richard67/patch-2
alikon Aug 9, 2019
454ce0d
Merge branch 'staging' into patch-111
HLeithner Aug 23, 2019
b23ce27
Merge branch 'staging' into patch-111
alikon Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions administrator/components/com_joomlaupdate/restore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*
* @copyright 2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
* @license GNU GPL v2 or - at your option - any later version
* @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
*/

/**
Expand Down Expand Up @@ -6184,7 +6185,7 @@ public static function parse_ini_file($file, $process_sections = false, $raw_dat
}

// Sections
if ($line{0} == '[')
if ($line[0] == '[')
{
$tmp = explode(']', $line);
$sections[] = trim(substr($tmp[0], 1));
Expand All @@ -6201,7 +6202,7 @@ public static function parse_ini_file($file, $process_sections = false, $raw_dat
$tmp = explode(';', $value);
if (count($tmp) == 2)
{
if ((($value{0} != '"') && ($value{0} != "'")) ||
if ((($value[0] != '"') && ($value[0] != "'")) ||
preg_match('/^".*"\s*;/', $value) || preg_match('/^".*;[^"]*$/', $value) ||
preg_match("/^'.*'\s*;/", $value) || preg_match("/^'.*;[^']*$/", $value)
)
Expand All @@ -6211,11 +6212,11 @@ public static function parse_ini_file($file, $process_sections = false, $raw_dat
}
else
{
if ($value{0} == '"')
if ($value[0] == '"')
{
$value = preg_replace('/^"(.*)".*/', '$1', $value);
}
elseif ($value{0} == "'")
elseif ($value[0] == "'")
{
$value = preg_replace("/^'(.*)'.*/", '$1', $value);
}
Expand Down