aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/7332] Redirect users back to post details when performing actions.Chris Smith2010-08-081-1/+1
| | | | | | | Moderators are redirected to the index page of the MCP after locking a post, a better location would be to direct them back to the post details. PHPBB3-7332
* Merge branch 'ticket/jellydoughnut/9757' into develop-olympusAndreas Fischer2010-07-311-2/+2
|\ | | | | | | | | * ticket/jellydoughnut/9757: [ticket/9757] Fix empty template variable {HISTORY_TITLE}
| * [ticket/9757] Fix empty template variable {HISTORY_TITLE}Josh Woody2010-07-291-2/+2
| | | | | | | | | | | | | | | | | | The template variable {HISTORY_TITLE} was always being set to the empty string. It is now filled with the title of the currently displayed message. It is not showed in prosilver or subsilver2 for aesthetic reasons (title is already prominent) PHPBB3-9757
* | Merge branch 'ticket/kellanved/9521' into develop-olympusAndreas Fischer2010-07-311-1/+7
|\ \ | | | | | | | | | | | | * ticket/kellanved/9521: [ticket/9521] Fix error reporting for the native SQL Server plugin.
| * | [ticket/9521] Fix error reporting for the native SQL Server plugin.Henry Sudhof2010-07-311-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The native SQL Server plugin used to return an error string when calling sql_error. However, some error condition checks are done using is_array. This patch wraps the error into an array to follow the error logic used elsewhere. PHPBB3-9521
* | | Merge branch 'ticket/jellydoughnut/9679' into develop-olympusAndreas Fischer2010-07-311-8/+11
|\ \ \ | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9679: [ticket/9679] phpBB offers to notify poster even if notification is disabled
| * | | [ticket/9679] phpBB offers to notify poster even if notification is disabledJosh Woody2010-07-291-8/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | The "notify user" check box would not do anything if checked in this case, but it was still presented. The checkbox is now only shown if there are notification options enabled. PHPBB3-9679
* | | Merge branch 'ticket/jellydoughnut/9749' into develop-olympusAndreas Fischer2010-07-311-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9749: [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in query
| * | | [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in queryJosh Woody2010-07-291-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The Fulltext_mysql class had different behavior when a dash was entered in the search query than the fulltext_native class. Specifically, a dash was automatically turned into boolean NOT even when the user wanted to search for legitimate hyphenated words like farty-pants PHPBB3-9749
* | | Merge branch 'ticket/jellydoughnut/9559' into develop-olympusAndreas Fischer2010-07-311-0/+7
|\ \ \ | |/ / |/| | | | | | | | * ticket/jellydoughnut/9559: [ticket/9559] Do not override queue package size in the case of an overflow
| * | [ticket/9559] Do not override queue package size in the case of an overflowJosh Woody2010-07-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This reverts r8025 to includes/functions_messenger.php. That code caused problems on hosters with email limits less than package_size*2.5. And it isn't desirable in general to over-ride the admin's configuration options. PHPBB3-9559
* | | Merge branch 'ticket/kellanved/9504' into develop-olympusAndreas Fischer2010-07-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/kellanved/9504: [ticket/9504] Allow whitespaces in gallery avatars
| * | | [ticket/9504] Allow whitespaces in gallery avatarsHenry Sudhof2010-07-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Gallery avatars are discovered on the server filesystem; to allow linking to the images, the filenames are urlencoded before being written to the database. However, getimagesize needs the decoded filename as input. PHPBB3-9504
* | | [ticket/9658] Optimize topic splitting.rxu2010-07-151-4/+4
| | | | | | | | | | | | | | | | | | | | | Split topics takes too long in some cases because of wrong variables or arrays values types adjustment. Cast values representing topic and forum ids as int. PHPBB3-9658
* | | Merge branch 'ticket/nickvergessen/7720' into develop-olympusAndreas Fischer2010-07-146-9/+9
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/7720: [ticket/7720] Fix alternative image-description for unread posts.
| * | | [ticket/7720] Fix alternative image-description for unread posts.Joas Schilling2010-07-146-9/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | Changed the wrong word "new" to "unread" as that is, what we show with the red-icons, not whether the post is new or not. Language variables were kept for backwards compatibility. PHPBB3-7720
* | | [ticket/9715] Better email regexCullen Walsh2010-07-111-1/+3
| | | | | | | | | | | | | | | | | | | | | Using email regex created by James Watts and Francisco Jose Martin Moreno. This passes many more tests for RFC valid emails. PHPBB3-9715
* | | Merge branch 'ticket/jellydoughnut/9637' into develop-olympusAndreas Fischer2010-07-119-24/+51
|\ \ \ | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9637: [ticket/9637] Do not cache SQL server version in all cases
| * | | [ticket/9637] Do not cache SQL server version in all casesJosh Woody2010-07-119-24/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the existing cache is global, there is no way to differentiate between each of two databases which may be two different DBAL objects pointing to servers with wildly different versions of an RDBMS. phpBB only has this situation in the UCF, thus only one file changed outside the DBAL. I have added a second optional parameter, $use_cache to each of the implementations of dbal::sql_server_info() PHPBB3-9637
* | | | [ticket/9629] Allow style.php to retrieve its session ID from cookiesJosh Woody2010-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style.php takes a session ID to ensure it gets the right language for a user, but that session ID is always passed in GET. This allows change allows the SID to be read from the cookie, and theoretically makes it friendlier for caching engines like Varnish. PHPBB3-9629
* | | | Merge branch 'ticket/jellydoughnut/9650' into develop-olympusAndreas Fischer2010-07-102-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9650: [ticket/9650] Do not allow banning the anonymous user by username
| * | | | [ticket/9650] Do not allow banning the anonymous user by usernameJosh Woody2010-07-082-3/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | Banning anonymous can result in bad things, like not being able to log in. However, it was possible until now. PHPBB3-9650
* | | | Merge branch 'ticket/p/9570' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/p/9570: [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
| * | | | [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.Oleg Pudeyev2010-07-061-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9570
* | | | Merge branch 'ticket/bantu/9451' into develop-olympusAndreas Fischer2010-07-083-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9451: [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
| * | | | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-073-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessary overhead in avatar_process_user() by optionally passing in the value of $can_upload. PHPBB3-9451
* | | | | Merge branch 'ticket/nickvergessen/9578' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9578: [ticket/9578] ACP Posting tab is missing "Post settings" module.
| * | | | | [ticket/9578] ACP Posting tab is missing "Post settings" module.Joas Schilling2010-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9578
* | | | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9695: [ticket/9695] Correct the improper display of user input in mcp_ban.php
| * | | | | | [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-011-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php PHPBB3-9695
* | | | | | Merge branch 'ticket/nickvergessen/9697' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9697: [ticket/9697] Backlink broken when the select parent forum does not exist.
| * | | | | | [ticket/9697] Backlink broken when the select parent forum does not exist.Joas Schilling2010-07-021-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9697
* | | | | | Merge branch 'ticket/jellydoughnut/9703' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9703: [ticket/9703] Correct database leak where deleting user did not rm some PM data
| * | | | | | [ticket/9703] Correct database leak where deleting user did not rm some PM dataJosh Woody2010-07-031-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users' PM rules and PM folders were being left intact when deleting them. PHPBB3-9703
* | | | | | [ticket/9712] Future dates can be formatted as 'less than one minute ago'Chris Smith2010-07-071-2/+2
| |_|/ / / |/| | | | | | | | | | | | | | PHPBB3-9712
* | | | | [ticket/9659] Signature options in set_user_optionsRichard Foote2010-07-061-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | The phpBB3 defaults are being used. PHPBB3-9659
* | | | Merge branch 'ticket/bantu/9655' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9655: [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
| * | | | [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.Andreas Fischer2010-06-141-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9655
* | | | | Merge branch 'ticket/bantu/9656' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9656: [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
| * | | | | [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.Andreas Fischer2010-06-201-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9656
* | | | | Merge branch 'ticket/bantu/9643' into develop-olympusAndreas Fischer2010-06-201-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9643: [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
| * | | | | [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.Andreas Fischer2010-06-081-1/+4
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9643
* | | | | Merge branch 'ticket/bantu/9112' into develop-olympusAndreas Fischer2010-06-201-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9112: [ticket/9112] Make sure current user can see most active forum/topic.
| * | | | | [ticket/9112] Make sure current user can see most active forum/topic.Andreas Fischer2010-06-151-0/+7
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-9112
* | | | | Merge branch 'ticket/jellydoughnut/9132' into develop-olympusAndreas Fischer2010-06-171-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9132: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
| * | | | | [ticket/9132] Oracle CLOB support is broken, preventing storage of long stringsJosh Woody2010-06-131-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This reverts Oracle support to the state it was in prior to phpBB 3.0.6. That is, storage of long strings works again (e.g. posts > 4 KB), but the database backup/restore functionality is broken. We feel that the ability to store long strings is more important than the DB restore, since Oracle 10g itself provides tools for backing up databases. PHPBB3-9132
* | | | | Merge branch 'ticket/rxu/9606' into develop-olympusAndreas Fischer2010-06-171-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9606: [ticket/9606] Optimize unread search option.
| * | | | | [ticket/9606] Optimize unread search option.rxu2010-05-171-3/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Get rid of redundant SQL query in search.php that should increase performance slightly. PHPBB3-9606
* | | | | Merge branch 'ticket/jellydoughnut/9633' into develop-olympusAndreas Fischer2010-06-151-0/+1
|\ \ \ \ \
| * | | | | [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"Josh Woody2010-06-011-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Due to an oversight, the default group was not properly checked in the user_add function. This fix corrects the check. No other changes are needed because they go direct to the database, this one used an array in memory. PHPBB3-9633