aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2014-05-262-2/+22
|\ | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12570] Keep MySQLi procedural [ticket/12570] Remove test for affected rows after SELECT [ticket/12570] Add a test for set_array() and updating with the same value [ticket/12570] Fix MySQL affectedrows [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS [ticket/12570] Add a unit test to show broken sql_affectedrows() [ticket/12570] Add test for updating a config with the same value
| * [ticket/12570] Keep MySQLi proceduralJoas Schilling2014-05-261-2/+2
| | | | | | | | PHPBB3-12570
| * [ticket/12570] Fix MySQL affectedrowsJoas Schilling2014-05-261-1/+20
| | | | | | | | | | | | | | | | We always want the number of matched rows instead of changed rows, when running an update. So when mysql_info() returns the number of matched rows we return that one instead of mysql_affected_rows() PHPBB3-12570
| * [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWSJoas Schilling2014-05-261-1/+2
| | | | | | | | PHPBB3-12570
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-267-2/+36
|\ \ | |/ | | | | | | | | | | * develop-ascraeus: [ticket/12074] Update the visibility of the constructor [ticket/12074] Don't log errors [ticket/12074] Managing extensions doesn't produce any log entry
| * Merge pull request #2429 from Nicofuma/ticket/12074Joas Schilling2014-05-267-2/+36
| |\ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12074] Managing extensions doesn't produce any log entry * Nicofuma/ticket/12074: [ticket/12074] Update the visibility of the constructor [ticket/12074] Don't log errors [ticket/12074] Managing extensions doesn't produce any log entry
| | * [ticket/12074] Update the visibility of the constructorTristan Darricau2014-05-091-1/+1
| | | | | | | | | | | | PHPBB3-12074
| | * [ticket/12074] Don't log errorsTristan Darricau2014-05-095-30/+1
| | | | | | | | | | | | PHPBB3-12074
| | * [ticket/12074] Managing extensions doesn't produce any log entryTristan Darricau2014-05-097-2/+65
| | | | | | | | | | | | PHPBB3-12074
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-7/+56
|\ \ \ | |/ / | | | | | | | | | | | | * develop-ascraeus: [ticket/12583] Redirect only on non-empty $message [ticket/12583] Add event core.mcp_warn_post_before/after
| * | Merge pull request #2487 from n-aleha/ticket/12583Joas Schilling2014-05-261-7/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12583] Add event core.mcp_warn_post_before/after * n-aleha/ticket/12583: [ticket/12583] Redirect only on non-empty $message [ticket/12583] Add event core.mcp_warn_post_before/after
| | * | [ticket/12583] Redirect only on non-empty $messagen-aleha2014-05-251-3/+7
| | | | | | | | | | | | | | | | PHPBB3-12583
| | * | [ticket/12583] Add event core.mcp_warn_post_before/aftern-aleha2014-05-231-5/+50
| | | | | | | | | | | | | | | | | | | | | | | | Event for when warning a user for a post. PHPBB3-12583
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-7/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12584] Redirect only on non-empty $message [ticket/12584] Add event core.mcp_warn_user_before/after
| * | | Merge pull request #2488 from n-aleha/ticket/12584Joas Schilling2014-05-261-7/+52
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12584] Add event core.mcp_warn_user_before/after * n-aleha/ticket/12584: [ticket/12584] Redirect only on non-empty $message [ticket/12584] Add event core.mcp_warn_user_before/after
| | * | | [ticket/12584] Redirect only on non-empty $messagen-aleha2014-05-251-3/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12584
| | * | | [ticket/12584] Add event core.mcp_warn_user_before/aftern-aleha2014-05-251-5/+46
| | |/ / | | | | | | | | | | | | | | | | | | | | Event for when warning a user from MCP. PHPBB3-12584
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-24/+58
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12270] Fixed topic counting bug and tests [ticket/12270] Fixed tests not working [ticket/12270] No quote notif and double poster notification fix [ticket/12270] Fixed tests [ticket/12270] Fixed rebase conflicts [ticket/12270] Correct confirm approval message for topics [ticket/12270] Correcting to follow phpBB coding standards [ticket/12270] Better structured code and no debug error message [ticket/12270] Correct notifications for posts/topics now working [ticket/12270] Reverted templates [ticket/12270] Correct post&topic approval msg, no template changes [ticket/12270] Corrent post and topic approval notification message
| * | | Merge pull request #2134 from marcosbc/ticket/12270Joas Schilling2014-05-261-24/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12270] Current post and topic approval notification message * marcosbc/ticket/12270: [ticket/12270] Fixed topic counting bug and tests [ticket/12270] Fixed tests not working [ticket/12270] No quote notif and double poster notification fix [ticket/12270] Fixed tests [ticket/12270] Fixed rebase conflicts [ticket/12270] Correct confirm approval message for topics [ticket/12270] Correcting to follow phpBB coding standards [ticket/12270] Better structured code and no debug error message [ticket/12270] Correct notifications for posts/topics now working [ticket/12270] Reverted templates [ticket/12270] Correct post&topic approval msg, no template changes [ticket/12270] Corrent post and topic approval notification message
| | * | | [ticket/12270] Fixed topic counting bug and testsmarcosbc2014-05-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Topics was not correctly counted (the counter didn't count topics that were re-approved, for example, but only the ones that were unapproved. This should also fix the test that wasn't working correctly. PHPBB3-12270
| | * | | [ticket/12270] Fixed tests not workingmarcosbc2014-05-211-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The success message wasn't output correctly if we were approving topics. PHPBB3-12270
| | * | | [ticket/12270] No quote notif and double poster notification fixmarcosbc2014-05-101-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since a call was added to self::approve_topic(), the poster would get double-notified about it (even if it was later marked as read). Also, when creating a new topic with a quote, it would not be notified, this has also been fixed. PHPBB3-12270
| | * | | [ticket/12270] Fixed rebase conflictsmarcosbc2014-05-031-21/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-12270
| | * | | [ticket/12270] Correct confirm approval message for topicsmarcosbc2014-05-031-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on approving a topic's first post in the MCP to approve the topic itself, the confirm box dialog asks whether to approve the post or not, instead of asking to approve the topic. To achieve this fix, we just need to count the topics to be approved and check if it's greater than zero. PHPBB3-12270
| | * | | [ticket/12270] Correcting to follow phpBB coding standardsmarcosbc2014-05-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I forgot to put the brackets (so it follows the phpBB coding standards) and changed "count($topic_id_list) > 0" to "!empty($topic_id_list)", making the syntax more comprehensible. PHPBB3-12270
| | * | | [ticket/12270] Better structured code and no debug error messagemarcosbc2014-05-031-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A variable (that's not essential) has been removed, two if's has been merged to an if-else control structure. A variable named topic_ids_list has been renamed to topic_id_list to follow the naming standard in that file's code. Also, the debug error has been fixed by changing the topic data key 'username' to 'post_username' in the array_merge function in approve_topics(). PHPBB3-12270
| | * | | [ticket/12270] Correct notifications for posts/topics now workingmarcosbc2014-05-031-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch should finally work correctly: Add the correct notification for post/topic approval without touching templates. This has been done by calling the function approve_topics() inside the approve_posts() function. It's the simplest way for this to work correctly. There may be a call to the DB but other ways (if any), without touching templates, would have been too messy for a function like this. PHPBB3-12270
| | * | | [ticket/12270] Reverted templatesmarcosbc2014-05-032-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some lines in the templates were not reverted correctly, so it's done now. PHPBB3-12270
| | * | | [ticket/12270] Correct post&topic approval msg, no template changesmarcosbc2014-05-032-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the previous commits, this patch removes the changes done to templates to depend only on code, as suggested by @nickvergessen. All previous modifications have been removed, with another one which checks, in the approve_posts() function, if it is sending a notification for post approval and it is the first one in the topic, send notification indicating that the topic has been approved (and not the post). If not the first post in the topic, do just as before (send a notification about a newly approved post). PHPBB3-12270
| | * | | [ticket/12270] Corrent post and topic approval notification messagemarcosbc2014-05-032-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you submit a post with needed approval (say user A), and then it gets approved by another user (user B), a subscribed user (user C) to that forum would receive a notification indicating: -A has replied to topic 'New Topic' in the forum 'xyz'. The expected result would be: -A has posted a new topic 'New topic' in the forum 'xyz'. This has fixed by adding a TOPIC_ID template variable to mcp_post.html and, in there, depending if the first post is the topic's first post or not, add a input's with name topic_id_list[] or post_id_list[] and then the respective value (TOPIC_ID or POST_ID). PHPBB3-12270
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-241-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
| * | | | Merge pull request #2458 from prototech/ticket/12543Joas Schilling2014-05-241-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12543] Only take over ENTER and ESC keys when alert box is active. * prototech/ticket/12543: [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
| | * | | | [ticket/12543] Only take over ENTER and ESC keys when alert box is active.Cesar G2014-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12543
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-241-10/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12275] Change if (empty) to if (!isset) [ticket/12275] Fix a bug on the event "core.modify_username_string"
| * | | | | Merge pull request #2199 from Zoddo/ticket/12275Joas Schilling2014-05-241-10/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12275] Fix a bug on the event "core.modify_username_string" * Zoddo/ticket/12275: [ticket/12275] Change if (empty) to if (!isset) [ticket/12275] Fix a bug on the event "core.modify_username_string"
| | * | | | | [ticket/12275] Change if (empty) to if (!isset)Zoddo2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12275
| | * | | | | [ticket/12275] Fix a bug on the event "core.modify_username_string"Zoddo2014-04-011-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the event "core.modify_username_string" also if $mode is "colour", "username" or "profile". PHPBB3-12275
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-245-7/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12531] Add some line breaks to really long lines [ticket/12531] Restore default topic link functionality in subsilver2
| * | | | | | Merge pull request #2444 from VSEphpbb/ticket/12531Joas Schilling2014-05-245-7/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12531] Restore default topic link behavior to subsilver2 * VSEphpbb/ticket/12531: [ticket/12531] Add some line breaks to really long lines [ticket/12531] Restore default topic link functionality in subsilver2
| | * | | | | | [ticket/12531] Add some line breaks to really long linesMatt Friedman2014-05-232-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12531
| | * | | | | | [ticket/12531] Restore default topic link functionality in subsilver2Matt Friedman2014-05-115-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12531
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-05-241-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12585] Use a 5 minutes interval instead of 10 minutes [ticket/12585] Don't check the cron on each page load
| * | | | | | | Merge pull request #2490 from Nicofuma/ticket/12585Andreas Fischer2014-05-241-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12585] Don't check the cron on each page load * Nicofuma/ticket/12585: [ticket/12585] Use a 5 minutes interval instead of 10 minutes [ticket/12585] Don't check the cron on each page load
| | * | | | | | | [ticket/12585] Use a 5 minutes interval instead of 10 minutesTristan Darricau2014-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12585
| | * | | | | | | [ticket/12585] Don't check the cron on each page loadTristan Darricau2014-05-221-1/+5
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-12585
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-05-235-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12555] Add canonical URL for viewtopic [ticket/12555] Add canonical URL for viewforum [ticket/12555] Add canonical URl for memberlist mode=viewprofile [ticket/12555] Allow to set canonical URLs to avoid duplicate content
| * | | | | | | Merge pull request #2468 from nickvergessen/ticket/12555Andreas Fischer2014-05-235-0/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/12555] Make use of canonical urls to avoid duplicate content * nickvergessen/ticket/12555: [ticket/12555] Add canonical URL for viewtopic [ticket/12555] Add canonical URL for viewforum [ticket/12555] Add canonical URl for memberlist mode=viewprofile [ticket/12555] Allow to set canonical URLs to avoid duplicate content
| | * | | | | | | [ticket/12555] Add canonical URL for viewtopicJoas Schilling2014-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids duplicate content of: * viewtopic.php?t=topic_id * viewtopic.php?f=forum_id&t=topic_id * viewtopic.php?f=forum_id&t=topic_id&hilit=highlight_string * viewtopic.php?f=forum_id&t=topic_id&view=unread * viewtopic.php?f=forum_id&p=post_id * viewtopic.php?f=forum_id&t=topic_id&start=0 PHPBB3-12555
| | * | | | | | | [ticket/12555] Add canonical URL for viewforumJoas Schilling2014-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids duplicate content of: * viewforum.php?f=forum_id * viewforum.php?f=forum_id&start=0 PHPBB3-12555
| | * | | | | | | [ticket/12555] Add canonical URl for memberlist mode=viewprofileJoas Schilling2014-05-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids duplicate content of: * memberlist.php?mode=viewprofile&u=user_id * memberlist.php?mode=viewprofile&un=username PHPBB3-12555
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 17:57:28 +0000