Skip to content
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.

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

[ticket/15351] Makes confirm_works in a router context (app.php) #4932

Merged
merged 1 commit into from
Sep 9, 2017

Conversation

Nicofuma
Copy link
Member

@Nicofuma Nicofuma commented Sep 8, 2017

PHPBB3-15351

Checklist:

  • Correct branch: master for new features; 3.2.x, 3.1.x for fixes
  • Tests pass
  • Code follows coding guidelines: master / 3.2.x, 3.1.x
  • Commit follows commit message format

Tracker ticket (set the ticket ID to your ticket ID):

https://tracker.phpbb.com/browse/PHPBB3-15351

@Nicofuma Nicofuma added this to the 3.2.2 milestone Sep 8, 2017
@Nicofuma Nicofuma force-pushed the ticket/15351 branch 2 times, most recently from e6343ef to 5256426 Compare September 8, 2017 09:13
@@ -496,4 +496,17 @@ public function get_valid_page($page, $mod_rewrite = false)

return $page;
}

/**
* Tells if the router is currently in use (if the current page is a route or note)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo

// Script name URI (e.g. phpBB/app.php)
$script_name = $this->symfony_request->getScriptName();

return basename($script_name) === 'app.' . $this->php_ext;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this also work when the .htaccess redirection is in place?
Bugs that are connected to this are nasty.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes it works. The script name should always be defined

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Surely it's always defined but does it also always point to the app.php when routing through it but is redirected by .htaccess?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep

@CHItA CHItA merged commit c368d17 into phpbb:3.2.x Sep 9, 2017
CHItA added a commit that referenced this pull request Sep 9, 2017
[ticket/15351] Makes confirm_works in a router context (app.php)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants