aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.Andreas Fischer2011-05-091-1/+0
| | | | | | | | | | L_FORUM_FOLDER_ALT was supposed to be a language variable but the language variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead. Also, the expected functionality is correctly implemented by FORUM_FOLDER_IMG_ALT. PHPBB3-9999
* Merge branch 'ticket/p/10003' into develop-olympusNils Adermann2011-05-051-4/+258
|\ | | | | | | | | | | | | | | | | | | | | * ticket/p/10003: [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications. [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools. [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools. [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools. [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools. [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools. [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
| * [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.Oleg Pudeyev2011-04-291-1/+1
| | | | | | | | PHPBB3-10003
| * [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.Oleg Pudeyev2011-04-291-2/+2
| | | | | | | | | | | | | | Most of it was already in db_tools, these changes could have applied to code that did not exist in db_tools at the time of the commit. PHPBB3-10003
| * [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.Oleg Pudeyev2011-04-291-4/+12
| | | | | | | | | | | | The diff in database_update was only partially relevant. PHPBB3-10003
| * [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.Oleg Pudeyev2011-04-291-6/+137
| | | | | | | | | | | | | | This was painful. Git wanted to patch hunks in wrong places. Hopefully I got it right. PHPBB3-10003
| * [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.Oleg Pudeyev2011-04-291-1/+109
| | | | | | | | | | | | This diff applied cleanly. PHPBB3-10003
| * [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.Oleg Pudeyev2011-04-291-2/+4
| | | | | | | | | | | | This change is somewhat questionable, maybe it should be reviewed. PHPBB3-10003
| * [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.Oleg Pudeyev2011-04-291-2/+7
| | | | | | | | PHPBB3-10003
* | Merge branch 'erikfrerejean/ticket/9961' into develop-olympusOleg Pudeyev2011-04-301-0/+7
|\ \ | |/ |/| | | | | * erikfrerejean/ticket/9961: [ticket/9961] Create log entries when users are activated.
| * [ticket/9961] Create log entries when users are activated.Erik Frèrejean2011-04-191-0/+7
| | | | | | | | | | | | | | | | | | | | * Create log entries when a user activates own account without also changing their password. * Additionally create admin log entries when an administrator activates user accounts. PHPBB3-9961
* | Merge remote branch 'bantu/ticket/10145' into develop-olympusIgor Wiedler2011-04-261-1/+1
|\ \ | | | | | | | | | | | | * bantu/ticket/10145: [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
| * | [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.Andreas Fischer2011-04-261-1/+1
| | | | | | | | | | | | PHPBB3-10145
* | | Merge remote branch 'p/ticket/7941' into develop-olympusAndreas Fischer2011-04-261-0/+3
|\ \ \ | |/ / |/| | | | | | | | * p/ticket/7941: [ticket/7941] Added @return to generate_board_url docstring.
| * | [ticket/7941] Added @return to generate_board_url docstring.Oleg Pudeyev2011-04-171-0/+3
| |/ | | | | | | PHPBB3-7941
* | Merge branch 'ticket/p/10147' into develop-olympusAndreas Fischer2011-04-231-1/+1
|\ \ | | | | | | | | | | | | * ticket/p/10147: [ticket/10147] Corrected a typo in includes/functions_template.php.
| * | [ticket/10147] Corrected a typo in includes/functions_template.php.Oleg Pudeyev2011-04-231-1/+1
| |/ | | | | | | PHPBB3-10147
* | [ticket/10141] Save a hash lookup when value is not in cache.Oleg Pudeyev2011-04-211-3/+7
| | | | | | | | PHPBB3-10141
* | [ticket/10141] Split double-assignment into conditional and unconditional part.Andreas Fischer2011-04-221-7/+5
| | | | | | | | PHPBB3-10141
* | [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.Bart van Bragt2011-04-211-2/+10
|/ | | | | | | Many sequences being converted are the same. Use a local cache to convert each sequence once, speeding up the function. PHPBB3-10141
* Merge branch 'ticket/nickvergessen/10109' into develop-olympusOleg Pudeyev2011-04-171-25/+26
|\ | | | | | | | | * ticket/nickvergessen/10109: [ticket/10109] Fix "Undefined Index" errors when copying a topic.
| * [ticket/10109] Fix "Undefined Index" errors when copying a topic.Joas Schilling2011-04-071-25/+26
| | | | | | | | PHPBB3-10109
* | Merge branch 'ticket/rxu/10117' into develop-olympusOleg Pudeyev2011-04-171-2/+7
|\ \ | | | | | | | | | | | | | | | * ticket/rxu/10117: [ticket/10117] Add one more missed 'u' modifier, add code comment [ticket/10117] Make smilies to be correctly parsed within unicode text.
| * | [ticket/10117] Add one more missed 'u' modifier, add code commentrxu2011-04-031-1/+6
| | | | | | | | | | | | PHPBB3-10117
| * | [ticket/10117] Make smilies to be correctly parsed within unicode text.rxu2011-04-031-2/+2
| | | | | | | | | | | | PHPBB3-10117
* | | Merge branch 'ticket/rxu/10115' into develop-olympusOleg Pudeyev2011-04-171-13/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/rxu/10115: [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes [ticket/10115] Make some text oriented BBCodes to properly handle unicode.
| * | | [ticket/10115] Switch UTF-8 mode on for the rest of BBCodesrxu2011-04-031-6/+6
| | | | | | | | | | | | | | | | PHPBB3-10115
| * | | [ticket/10115] Make some text oriented BBCodes to properly handle unicode.rxu2011-04-021-7/+7
| |/ / | | | | | | | | | | | | | | | [quote], [b], [i], [size], [color], [u], [list] are affected. PHPBB3-10115
* | | Merge branch 'ticket/bantu/10128' into develop-olympusOleg Pudeyev2011-04-101-6/+6
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/10128: [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
| * | | [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().Andreas Fischer2011-04-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user_ban() function is shared by the MCP and the ACP. Mark trigger_error() calls as errors by passing E_USER_WARNING to make the error message appear on red background (instead of green background) in the ACP. PHPBB3-10128
* | | | Merge branch 'ticket/erikfrerejean/9581' into develop-olympusOleg Pudeyev2011-04-101-10/+35
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/erikfrerejean/9581: [ticket/9581] Fix missing index [ticket/9581] Slightly tweaked queries [ticket/9581] Make banlist table select optional [ticket/9581] Mass e-mail to banned users
| * | | [ticket/9581] Fix missing indexErik Frèrejean2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `u.user_lang` to the select statement to prevent "undefined index" errors. PHPBB3-9581
| * | | [ticket/9581] Slightly tweaked queriesErik Frèrejean2011-03-041-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the queries based upon comments by Oleg and Nick, this should return the expected result in every case. PHPBB3-9581
| * | | [ticket/9581] Make banlist table select optionalErik Frèrejean2011-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Per Nick, only set the `BANLIST_TABLE` in the select statement if the `$sql_ban_where` variable is set. PHPBB3-9581
| * | | [ticket/9581] Mass e-mail to banned usersErik Frèrejean2011-03-041-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the suggestion made by Adam in the ticket, this will add an additional checkbox to the mass e-mail page. By checking this the mass e-mail shall also be send to banned users. By default banned users however are excluded from the mass e-mail. PHPBB3-9581
* | | | [ticket/10084] Add smilie/icon errors out when file is missingJoas Schilling2011-04-071-0/+4
| |_|/ |/| | | | | | | | PHPBB3-10084
* | | [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.Joas Schilling2011-04-031-1/+1
| |/ |/| | | | | PHPBB3-10121
* | Merge branch 'ticket/bantu/9751' into develop-olympusAndreas Fischer2011-04-011-14/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9751: [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY. [ticket/9751] Compare $password with empty string instead of casting it to bool [ticket/9751] Use a switch/case block without break for password complexity. [ticket/9751] Password requirement "Must contain letters and numbers" fails
| * | [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.Andreas Fischer2011-04-011-4/+2
| | | | | | | | | | | | | | | | | | | | | Add shortcut logic for pass_complex because this is the default value phpBB ships with and there is nothing to do in that function in that case. PHPBB3-9751
| * | [ticket/9751] Compare $password with empty string instead of casting it to boolAndreas Fischer2011-04-011-1/+1
| | | | | | | | | | | | PHPBB3-9751
| * | [ticket/9751] Use a switch/case block without break for password complexity.Andreas Fischer2011-04-011-11/+13
| | | | | | | | | | | | PHPBB3-9751
| * | [ticket/9751] Password requirement "Must contain letters and numbers" failsrxu2011-04-011-4/+2
| | | | | | | | | | | | PHPBB3-9751
* | | Merge remote branch 'callumacrae/ticket/10112' into develop-olympusIgor Wiedler2011-03-312-28/+28
|\ \ \ | | | | | | | | | | | | | | | | * callumacrae/ticket/10112: [ticket/10112] Replaced a couple occurrences of count() with sizeof()
| * | | [ticket/10112] Replaced a couple occurrences of count() with sizeof()Callum Macrae2011-03-302-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | As per the coding guidlines, sizeof() should be used instead of count(). PHPBB3-10112
* | | | Merge branch 'ticket/haklop/10110' into develop-olympusIgor Wiedler2011-03-311-0/+155
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/haklop/10110: [ticket/10110] Remove tab from empty lines [ticket/10110] Enable the serialization and add a constant for defined the database [ticket/10110] Update comments with a link to the phpredis extension [ticket/10110] Add Redis ACM backend
| * | | [ticket/10110] Remove tab from empty linesEric2011-03-311-6/+6
| | | | | | | | | | | | | | | | PHPBB3-10110
| * | | [ticket/10110] Enable the serialization and add a constant forEric2011-03-311-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | defined the database PHPBB3-10110
| * | | [ticket/10110] Update comments with a link to the phpredis extensionEric2011-03-311-2/+5
| | | | | | | | | | | | | | | | PHPBB3-10110
| * | | [ticket/10110] Add Redis ACM backendEric2011-03-311-0/+142
| | | | | | | | | | | | | | | | PHPBB3-10110
* | | | Merge branch 'ticket/jellydoughnut/9946' into develop-olympusAndreas Fischer2011-03-241-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * ticket/jellydoughnut/9946: [ticket/9946] Allow storage of data >4kB on Oracle again