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/15137] Global Announcements shouldn't always be never ending #4752

Closed
wants to merge 2 commits into
base: 3.1.x
from

Conversation

Projects
None yet
3 participants
@nomind60s
Copy link

nomind60s commented Mar 21, 2017

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:

  • 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-15137

[ticket/15137] Global announcements can stick for a non-zero number o…
…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

@Nicofuma Nicofuma added the 3.2 (Rhea) label Mar 21, 2017

@Nicofuma Nicofuma added this to the 3.2.1 milestone Mar 21, 2017

@Nicofuma Nicofuma changed the base branch from 3.1.x to 3.2.x Mar 21, 2017

@Nicofuma Nicofuma changed the base branch from 3.2.x to 3.1.x Mar 21, 2017

@@ -241,7 +241,7 @@
'SMILIES_ARE_ON' => 'Smilies are <em>ON</em>',
'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.',

This comment has been minimized.

@DavidIQ

DavidIQ Mar 21, 2017

Member

I don't think this is necessary. There are only 2 types of posts, not three.

This comment has been minimized.

@nomind60s

nomind60s Mar 21, 2017

Author

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.

This comment has been minimized.

@DavidIQ

DavidIQ Mar 21, 2017

Member

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.

This comment has been minimized.

@nomind60s

nomind60s Mar 21, 2017

Author

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.

This comment has been minimized.

@Nicofuma

Nicofuma Mar 21, 2017

Member

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.

[ticket/15137] Missed one language string change
Change STICKY_ANNOUNCE_TIME_LIMIT for consistency

PHPBB3-15137

@Nicofuma Nicofuma closed this in c9aab0b Mar 21, 2017

@Nicofuma

This comment has been minimized.

Copy link
Member

Nicofuma commented Mar 21, 2017

Thanks for contributing (merged via c9aab0b)

@nomind60s

This comment has been minimized.

Copy link
Author

nomind60s commented Mar 22, 2017

I'm a bit confused as to why the changes to includes/functions_posting.php were not merged. They are part of the fix.

@Nicofuma

This comment has been minimized.

Copy link
Member

Nicofuma commented Mar 23, 2017

certainly a mistake in the merge conflict resolution

@nomind60s

This comment has been minimized.

Copy link
Author

nomind60s commented Mar 23, 2017

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?

@Nicofuma

This comment has been minimized.

Copy link
Member

Nicofuma commented Mar 23, 2017

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.

@nomind60s

This comment has been minimized.

Copy link
Author

nomind60s commented Mar 23, 2017

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.