Skip to content
Snippets Groups Projects
Commit 9deabda0 authored by Philipp Gampe's avatar Philipp Gampe Committed by Christian Kuhn
Browse files

[BUGFIX] Hardcoded variable in CookieJar.php

If pear installs a package, it replaces all occurrences of data_dir with
the actual dirname. This should not have happened in then shipped
version.

Change-Id: I207fd879d55412f97c93ed1bee25d8283f4f6d6c
Fixes: #34923
Releases: 6.0, 4.7, 4.6
Reviewed-on: http://review.typo3.org/9693
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
parent 18b16f66
Branches
Tags
No related merge requests found
......@@ -442,7 +442,7 @@ class HTTP_Request2_CookieJar implements Serializable
// load the list if needed
if (empty(self::$psl)) {
$path = '/usr/share/pear/data' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
$path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
if (0 === strpos($path, '@' . 'data_dir@')) {
$path = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
. DIRECTORY_SEPARATOR . 'data');
......@@ -496,4 +496,4 @@ class HTTP_Request2_CookieJar implements Serializable
return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
}
}
?>
\ No newline at end of file
?>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment