1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

5398 Commits

Author SHA1 Message Date
Oleg Pudeyev
4239d8aa4e Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into develop
* brunoais/feature/save-post-on-report:
  [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
  [feature/save-post-on-report] bbcode_nl2br missing.
  [feature/save-post-on-report] Change the column type of reported text
  [feature/save-post-on-report] Changed the name of the column
  [feature/save-post-on-report] Bug fix table name
  [feature/save-post-on-report] Saves the post reported when a report is creat
  [feature/save-post-on-report] The complete changes for this feature
2012-03-27 22:45:02 -04:00
Andreas Fischer
a74e050310 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10694] Adjusting details link to 5.3 announcement
  [ticket/10694] Update PHP warning to 5.3.2
2012-03-26 00:06:25 +02:00
Andreas Fischer
a618e22fca Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympus
* unknownbliss/ticket/10694:
  [ticket/10694] Adjusting details link to 5.3 announcement
  [ticket/10694] Update PHP warning to 5.3.2
2012-03-26 00:06:17 +02:00
Andreas Fischer
0257cd1653 Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into develop
* dhruvgoel92/ticket/10703:
  [ticket/10703] Added a condition to check if ext directory exists
2012-03-25 23:58:56 +02:00
Dhruv Goel
18c541dfee [ticket/10703] Added a condition to check if ext directory exists
The existence of ext directory is checked, if not present a proper
error message that file doesn't exist is printed out. No Fatal
Error messages.

PHPBB3-10703
2012-03-23 00:27:29 +05:30
Andreas Fischer
cc13bac412 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans

Conflicts:
	phpBB/includes/functions_user.php
2012-03-22 18:15:10 +01:00
Andreas Fischer
57eb50812f Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympus
* rxu/ticket/10684:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans
2012-03-22 18:14:13 +01:00
rxu
5a9dd1994f [ticket/10684] Adjust function and parameter name, minor changes.
PHPBB3-10684
2012-03-22 21:19:01 +08:00
Andreas Fischer
099f8de621 Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop
* dhruvgoel92/ticket/10704:
  [ticket/10704] minor typo in a comment
2012-03-22 10:59:41 +01:00
Andreas Fischer
89f988ecdd Merge remote-tracking branch 'p/task/php54-ascraeus' into develop
* p/task/php54-ascraeus:
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
2012-03-22 10:56:07 +01:00
Andreas Fischer
21bd0ca31a Merge branch 'develop-olympus' into develop
With 5efdbfa5e4e3c00c08167cdfff912ee4937f4fd2 reverted.

* develop-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:51:03 +01:00
Andreas Fischer
e5205ba2f8 Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympus
* p/task/php54-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:49:37 +01:00
Dhruv Goel
92f771eb82 [ticket/10704] minor typo in a comment
Make sure $id separation is working fine

PHPBB3-10704
2012-03-22 03:10:14 +05:30
Bruno Ais
28c6b95100 [feature/save-post-on-report] bbcode_nl2br missing.
New lines were missing in the reported_post_text.
By adding the bbcode_nl2br() became as it is supposed to.

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
18373035c3 [feature/save-post-on-report] Changed the name of the column
The name of the column was changed from reported_post AND
reported_text to reported_post_text.
This change was made by request

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
95b5109c62 [feature/save-post-on-report] The complete changes for this feature
This covers all the changes so that when a report is made, the post
itself is copied and displayed in the MCP instead of the current post.
Unfortunatly, I made all commits in the wrong way and they were lost.
Now I have only the final files.
2012-03-19 08:27:31 -04:00
Oleg Pudeyev
1fa39ea722 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:35 -04:00
Oleg Pudeyev
81eeafbb8d Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus
* nickvergessen/ticket/8636:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:29 -04:00
Oleg Pudeyev
ccdd176b72 [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
Split module_auth into a static and a non-static version.

Call the static version statically and the non-static version non-statically.

PHPBB3-10615
2012-03-16 04:56:41 -04:00
Oleg Pudeyev
5efdbfa5e4 [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
We cannot use static in Olympus because it must be PHP 4 compatible.

Therefore disable E_STRICT for Olympus.

This commit should be reverted for Ascraeus.

PHPBB3-10615
2012-03-15 22:47:42 -04:00
Oleg Pudeyev
71afba0ded [task/php54] Refactor error_reporting call slightly.
Separate error level assignment into a variable in this commit
so that the only difference between Olympus and Ascraeus
is the addition of logic altering $level.

PHPBB3-10615
2012-03-15 22:46:06 -04:00
rxu
ff8d523768 [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
PHPBB3-10684
2012-03-12 01:57:51 +08:00
rxu
da395edbca [ticket/10684] Remove intval mapping for array keys
PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
2012-03-12 01:47:28 +08:00
rxu
321d0d9b56 [ticket/10684] Adjust pm_notifications() to handle stale bans
- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
2012-03-12 01:44:00 +08:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer
PHPBB3-10684
2012-03-11 00:56:07 +08:00
Michael Cullum
668c61686b [ticket/10694] Adjusting details link to 5.3 announcement
PHPBB3-10694
2012-03-10 16:47:07 +00:00
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update
PHPBB3-10684
2012-03-10 00:17:39 +08:00
Michael Cullum
fbe8086697 [ticket/10694] Update PHP warning to 5.3.2
PHPBB3-10694
2012-03-09 16:10:02 +00:00
rxu
f563647e4b [ticket/10684] Remove isset() for $sql_ignore_users update
PHPBB3-10684
2012-03-09 22:35:13 +08:00
Oleg Pudeyev
c001bb9c03 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
2012-03-09 05:55:56 -05:00
Oleg Pudeyev
bd1fb91dd2 Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympus
* rxu/ticket/9831:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
2012-03-09 05:24:03 -05:00
Oleg Pudeyev
5c4788a24c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
2012-03-09 04:42:16 -05:00
Oleg Pudeyev
0ec8e9dbff Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympus
* rxu/ticket/9084:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
2012-03-09 04:42:05 -05:00
Oleg Pudeyev
cd61de4bfd [ticket/9084] Explain the logic.
PHPBB3-9084
2012-03-09 04:35:09 -05:00
rxu
ee6783109a [ticket/10684] Fix 2 typos in comment lines.
PHPBB3-10684
2012-03-09 16:41:49 +08:00
rxu
025de9ee19 [ticket/10684] Send notifications for users with stale bans
PHPBB3-10684
2012-03-08 23:28:03 +08:00
Oleg Pudeyev
35309de0b7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
2012-03-08 08:44:32 -05:00
Andreas Fischer
c11607bdd1 [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
There is no point in fetching the table status again.

PHPBB3-10653
2012-03-08 14:39:03 +01:00
Andreas Fischer
01d90e59a8 [ticket/9813] Only get posts table row count if we detected a fulltext index.
PHPBB3-9813
2012-03-08 14:38:59 +01:00
Vjacheslav Trushkin
a98117b229 [feature/append_var] Adding append_var template class function
Adding append_var template class function

PHPBB3-10666
2012-03-05 02:41:42 +02:00
Andreas Fischer
785c75254e [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
Since this is 'only' for statistics anyway, using an estimated value does no
harm. Also, if MyISAM is the underlying storage engine for the posts table,
the value will actually be exact.

PHPBB3-9813
2012-03-05 00:29:28 +01:00
Andreas Fischer
f9953fc339 [ticket/10653] Add ability to count table rows to database abstraction layer.
PHPBB3-10653
2012-03-03 21:04:01 +01:00
Andreas Fischer
97cf433dea [ticket/9813] Use table status row count only if greater than 100000 or exact.
PHPBB3-9813
2012-03-03 21:03:55 +01:00
Andreas Fischer
efe25a0b49 [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
PHPBB3-9813
2012-03-03 21:03:50 +01:00
Andreas Fischer
d6a6d63a9e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
2012-03-02 14:22:32 +01:00
Andreas Fischer
d67fae0f09 Merge branch 'ticket/bantu/8652' into develop-olympus
* ticket/bantu/8652:
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
2012-03-02 14:22:18 +01:00
Andreas Fischer
b74530259f [ticket/8652] Comment for also updating forum watch table in user_notification.
PHPBB3-8652
2012-03-02 14:20:29 +01:00
Bruno Ais
470b79c9e3 [ticket/8652] Sending 2 emails on 2 replies
This is a fix for the problem of the system sending 2 emails when there are 2
replies to a topic where the user is subscribed in a topic and the forum that
contains the topic.
This simple fix seems to solve the problem. In simple tests I made it shows
it does.

PHPBB3-8652
2012-03-02 11:08:56 +00:00
Andreas Fischer
89af42dfab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10639] Do not allow negative post count as rank's minimum posts
2012-02-28 22:29:03 +01:00
Andreas Fischer
2f95a67765 Merge remote-tracking branch 'nickvergessen/ticket/10639' into develop-olympus
* nickvergessen/ticket/10639:
  [ticket/10639] Do not allow negative post count as rank's minimum posts
2012-02-28 22:28:54 +01:00