mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 23:41:29 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus

Browse Source 
* github-exreaction/ticket/8323:
  [ticket/8323] Cache auth request
  [ticket/8323] Combine into a single query
  [ticket/8323] Comments on phpbb_get_banned_user_ids input for test
  [ticket/8323] More readability in test case
  [ticket/8323] Comments
  [ticket/8323] dataProvider for the test; better test data
  [ticket/8323] Comments
  [ticket/8323] Unit test for phpbb_get_banned_user_ids
  [ticket/8323] Comments for inactive reasons in constants.php
  [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
  [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
  [ticket/8323] Correct PM notification settings (only notify those who can receive them)
  [ticket/8323] Cleanup viewtopic code (not sure how this mess happened)
  [ticket/8323] Allow sending PMs to temporarily banned users
  [ticket/8323] Do not allow sending PMs to Inactive users
  [ticket/8323] Hide the Send PM link if users cannot receive the PM
  [ticket/8323] Correcting the comment
  [ticket/8323] Do not allow sending of Private Messages to users who are banned
  [ticket/8323] Remove code used for testing
  [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages

Conflicts:
	phpBB/language/en/ucp.php
This commit is contained in:
Nils Adermann
2014-05-02 15:54:10 +02:00
parent d52c2d1b5c d14aed0819
commit 97e651a491
8 changed files with 248 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/functions/fixtures/banned_users.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_banlist">
<column>ban_userid</column>
<column>ban_exclude</column>
<column>ban_end</column>
<row>
<value>1</value>
<value>1</value>
<value>0</value>
</row>
<row>
<value>2</value>
<value>0</value>
<value>0</value>
</row>
<row>
<value>3</value>
<value>0</value>
<value>0</value>
</row>
<row>
<value>4</value>
<value>0</value>
<value>2</value>
</row>
<row>
<value>5</value>
<value>0</value>
<value>999999999999999999999</value>
</row>
<row>
<value>6</value>
<value>0</value>
<value>3</value>
</row>
</table>
</dataset>