[ticket/15137] Global Announcements shouldn't always be never ending#4752
[ticket/15137] Global Announcements shouldn't always be never ending#4752nomind60s wants to merge 2 commits intophpbb:3.1.xfrom nomind60s:ticket/15137
Conversation
…f days To be consistent with Sticky and Announcements topic types, Global announcements can now stick for a non-zero number of days, i.e. they are no longer never ending. Before this change, if the topic type was Global and a non-zero number of days where set to stick topic, the number was silently ignored and a Global announcement was always never ending. PHPBB3-15137
| 'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit', | ||
| 'STICK_TOPIC_FOR' => 'Stick topic for', | ||
| 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.', | ||
| 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 for a never ending Sticky/Announcement/Global. Please note that this number is relative to the date of the post.', |
There was a problem hiding this comment.
I don't think this is necessary. There are only 2 types of posts, not three.
There was a problem hiding this comment.
I waffled on it, but there are four choices given, Normal, Sticky, Announcement and Global. I've been around phpBB long enough to know that Global is a special case of Announcement, but I couldn't assume that every board admin would know that, so thought adding it would make it complete and clear.
There was a problem hiding this comment.
You would have to be consistent and also change STICKY_ANNOUNCE_TIME_LIMIT. I'm not sure this change is needed at all however. I'll let the person that would merge this make that decision.
There was a problem hiding this comment.
You are correct I missed that one. I'm still on the fence on whether the change is necessary as well and appreciate the feedback. I tend to err on the side of caution and over-explaining. I can live with having whomever merges make the decision also. They've probably got more experience with phpBB code development than I.
There was a problem hiding this comment.
I don't really mind if it is a bit too explicit. Especially because it will makes it clear for existing users used to the current behavior.
Change STICKY_ANNOUNCE_TIME_LIMIT for consistency PHPBB3-15137
|
Thanks for contributing (merged via c9aab0b) |
|
I'm a bit confused as to why the changes to |
|
certainly a mistake in the merge conflict resolution |
|
I know what the problem is, a variable name used in the changed line is different between 3.1.x and 3.2.x. Who takes care of the merge conflict resolution, the fixer or the merger? |
|
it depends, but in this case I did and I missed it. But it's not a big deal, just send a new PR against 3.2 fixing the issue (if you don't I will do it later). You can reuse the same ticket number. |
|
I understand the changes to make, but I'm still learning the github/pull request stuff so I'll leave it to you. From what I can see, none of the changes are merged to 3.1.x and they are partially merged to 3.2.x. Too many parts that I'm not comfortable that I understand at this point. |
3 participants
To be consistent with Sticky and Announcements topic types, Global announcements can
now stick for a non-zero number of days, i.e. they are no longer never ending.
Before this change, if the topic type was Global and Stick topic for: was set to a non-zero
number of days, the number was silently ignored and a Global announcement was always
never ending.
PHPBB3-15137
Checklist:
Tracker ticket (set the ticket ID to your ticket ID):
https://tracker.phpbb.com/browse/PHPBB3-15137