phpBB Master

• 

  Marc 31 Oct 2017 28df230f8df4fbfadcdfb9a309e7750f0f4c8784

  Merge branch '3.2.x'
• 

  Marc 31 Oct 2017 131c26449228221f0028711e41ab79191ab2c25a m

  Merge pull request #4985 from senky/ticket/13150
  [ticket/13150] Add core.phpbb_log_get_topic_auth_sql_after
• 

  Marc 31 Oct 2017 c6e8a5ddee4ffe06d7bc34f8192efce7d2a41917

  Merge branch '3.2.x'
• 

  Marc 31 Oct 2017 200562548edb3c9733461a55486636b7a420d41e m

  Merge pull request #4980 from senky/ticket/15381
  [ticket/15381] Better explain CONTACT_US_ENABLE_EXPLAIN
• 

  Marc 31 Oct 2017 a51741df4123bc1c46b33f74a54361daa49c66ce

  Merge branch '3.2.x'
• 

  Marc 31 Oct 2017 1744d829adad29bcfbfa01e7568960f081507b84 m

  Merge pull request #4978 from ftc2/3.2.x
  [ticket/15385] nginx.sample.conf: www redirection, security regex
• 

  Marc 31 Oct 2017 330b06b3e8e17d14b2a82609df2ab4876df8073c

  Merge pull request #5021 from marc1706/ticket/15245
  [ticket/15245] Fix tests after merging into master
• 

  Marc 31 Oct 2017 dee88e28e0e36f7516262036c0cfb62267cbc19d m

  [ticket/15245] Fix tests after merging into master
  PHPBB3-15245

  • tests/feed/attachments_base_test.php (version dee88e28e0e36f7516262036c0cfb62267cbc19d)
• 

  Senky 09 Oct 2017 4d333e7f706530839b784bb3ef99cd3d6d247593 m

  [ticket/13150] Add core.phpbb_log_get_topic_auth_sql_after
  PHPBB3-13150

  • phpBB/phpbb/log/log.php (version 4d333e7f706530839b784bb3ef99cd3d6d247593)
• 

  Senky 02 Oct 2017 99374731d1e8176de909b3600359578ea997beee m

  [ticket/15381] Better explain CONTACT_US_ENABLE_EXPLAIN
  PHPBB3-15381

  • phpBB/language/en/acp/board.php (version 99374731d1e8176de909b3600359578ea997beee)
• 

  ftc2 <ftc2@users.noreply.github.com> 02 Oct 2017 8f97887683581555187caf6bfe4d1f21c5780341 m

  [ticket/15385] nginx.sample.conf: www redirection, security regex
  according to the latest wiki info:
      http://wiki.nginx.org/Pitfalls#Taxing_Rewrites
  `return 301` is preferred over a rewrite.
  
  also, the 'security' regex breaks some official extensions because it
  will match and deny access to `/ext/phpbb`.
  looking through the names of dirs and files containing `phpbb`, it
  looks like the intent of the regex was to only disallow the folder
  `phpbb` in the root dir and not other `/phpbb` matches.
  a negative lookbehind was added to specifically not match `/ext/phpbb`
  but still match other occurrences of `/phpbb`.
  
  Tracker ticket: https://tracker.phpbb.com/browse/PHPBB3-15385

  • phpBB/docs/nginx.sample.conf (version 8f97887683581555187caf6bfe4d1f21c5780341)