Build: #116 was successful Changes by Marc

Stages & jobs

  1. Default Stage

Code commits

phpBB 3.3.x

  • Marc

    Marc d7c3d597995f083476403ee583594775c7698066

    Merge pull request #5845 from bwoebi/patch-1
    [ticket/16363] Allow replying to locked topics if user has m_lock permissions

  • Marc

    Marc 1c8e7a3483316707b7635d01fd32495d4537e96f

    Merge branch '3.2.x' into 3.3.x

  • Marc

    Marc a88e6409247bae5b6bb3465c69cb037a6a18c6e2 m

    Merge pull request #5880 from mrgoldy/ticket/15438
    [ticket/15438] Correct log language strings: from > for

  • mrgoldy <gijsmartens1@gmail.com>

    mrgoldy <gijsmartens1@gmail.com> cada6f294de0f556b3f10ea0f6d834d488edc3c4 m

    [ticket/15438] Correct log language strings: remove excessive o
    PHPBB3-15438

    • phpBB/language/en/acp/common.php (version cada6f294de0f556b3f10ea0f6d834d488edc3c4)
  • mrgoldy <gijsmartens1@gmail.com>

    mrgoldy <gijsmartens1@gmail.com> 4ade2789f6796ffc56aba0a3fac947b47fd72371 m

    [ticket/15438] Correct log language strings
    PHPBB3-15438

    • phpBB/language/en/acp/common.php (version 4ade2789f6796ffc56aba0a3fac947b47fd72371)
  • mrgoldy <gijsmartens1@gmail.com>

    mrgoldy <gijsmartens1@gmail.com> 558f672634f0488e329229d7c75605b07bcb1f69 m

    [ticket/15438] Correct log language strings: from > for
    PHPBB3-15438

    • phpBB/language/en/acp/common.php (version 558f672634f0488e329229d7c75605b07bcb1f69)
  • Bob Weinand <bobwei9@hotmail.com>

    Bob Weinand <bobwei9@hotmail.com> 86cf600d9e8085ed6c4ff8fe841fe1a5b2375bf9 m

    [ticket/16363] Allow replying to locked topics if user has m_lock permissions
    An user may not be able to edit - but lock and unlock.
    It is terribly inconvenient for users being only able to un/lock threads to
    have to first unlock a topic, then reply and then re-lock it.

    Thus in reply mode we check for lock permissions instead of edit.

    This also includes editing if the user could normally edit his post if it
    weren't for the lock.

    PHPBB3-16363

    • phpBB/posting.php (version 86cf600d9e8085ed6c4ff8fe841fe1a5b2375bf9)
    • phpBB/viewtopic.php (version 86cf600d9e8085ed6c4ff8fe841fe1a5b2375bf9)