Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

FIX Remove check for existing BASE_PATH in ParameterConfirmationToken #2252

Closed
wants to merge 1 commit into from

2 participants

@hafriedlander

ParameterConfirmationToken#pathForToken would check for BASE_PATH being set
before trying to determine base path itself. However this just caused
problems, since there were several entry points to the method, some where
BASE_PATH might have been set, some where it wasnt

@hafriedlander hafriedlander FIX Remove check for existing BASE_PATH in ParameterConfirmationToken
ParameterConfirmationToken#pathForToken would check for BASE_PATH being set
before trying to determine base path itself. However this just caused
problems, since there were several entry points to the method, some where
BASE_PATH might have been set, some where it wasnt
8fb2eb3
@sminnee
Owner

Rejected as unworkable, see original issue.

@sminnee sminnee closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 21, 2013
  1. @hafriedlander

    FIX Remove check for existing BASE_PATH in ParameterConfirmationToken

    hafriedlander authored
    ParameterConfirmationToken#pathForToken would check for BASE_PATH being set
    before trying to determine base path itself. However this just caused
    problems, since there were several entry points to the method, some where
    BASE_PATH might have been set, some where it wasnt
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 6 deletions.
  1. +1 −6 core/startup/ParameterConfirmationToken.php
View
7 core/startup/ParameterConfirmationToken.php
@@ -16,12 +16,7 @@ class ParameterConfirmationToken {
protected $token = null;
protected function pathForToken($token) {
- if (defined('BASE_PATH')) {
- $basepath = BASE_PATH;
- }
- else {
- $basepath = rtrim(dirname(dirname(dirname(dirname(__FILE__)))), DIRECTORY_SEPARATOR);
- }
+ $basepath = rtrim(dirname(dirname(dirname(dirname(__FILE__)))), DIRECTORY_SEPARATOR);
require_once(dirname(dirname(__FILE__)).'/TempPath.php');
$tempfolder = getTempFolder($basepath ? $basepath : DIRECTORY_SEPARATOR);
Something went wrong with that request. Please try again.