[ticket/9918] $redirect variable used from now #722
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
According to comment marc1706 added to tracker http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120 I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed. PHPBB3-9918
| @@ -433,7 +433,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) | |||
| confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields); | |||
| } | |||
|
|
|||
| $redirect = request_var('redirect', "index.$phpEx"); | |||
| $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id"); | |||
There was a problem hiding this comment.
First of, the default link should be one string or you should use append_sid(). Either way, you'll need to run reapply_sid() on the $redirect link afterwards.
There was a problem hiding this comment.
New commit changes this to one string starting with:
{$phpbb_root_path}viewtopic.$phpEx?f=
I know this is not preffered in phpBB, but I do not see any point in calling append_sid just because of conventions. I hope that this change is acceptable...
As per marc1706's note, all request_var functions now have only one string in default value PHPBB3-9918
|
I'm guessing sid still has to be applied. |
|
SID is applied on lines looking like this:
or am I wrong? |
p
added a commit
to p/phpbb3
that referenced
this pull request
Nov 7, 2012
* Senky/ticket/9918: [ticket/9918] default values in request_var changed to one string [ticket/9918] $redirect variable used from now
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
According to comment marc1706 added to tracker
http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120
I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed.
http://tracker.phpbb.com/browse/PHPBB3-9918