aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-1/+13
|\ | | | | | | | | | | * develop-olympus: [ticket/10005] Add description to test cases [ticket/10005] Add validation of dropdown custom profile field values
| * Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympusAndreas Fischer2011-06-091-1/+13
| |\ | | | | | | | | | | | | | | | * naderman/ticket/10005: [ticket/10005] Add description to test cases [ticket/10005] Add validation of dropdown custom profile field values
| | * [ticket/10005] Add validation of dropdown custom profile field valuesNils Adermann2011-06-021-1/+13
| | | | | | | | | | | | PHPBB3-10005
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-062-10/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10067] Add separator to h_radio to place options on individual lines Conflicts: phpBB/adm/index.php
| * | Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympusAndreas Fischer2011-06-061-8/+9
| |\ \ | | | | | | | | | | | | | | | | * naderman/ticket/10067: [ticket/10067] Add separator to h_radio to place options on individual lines
| | * | [ticket/10067] Add separator to h_radio to place options on individual linesNils Adermann2011-06-051-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous mechanism for account activation resulted in two h_radio calls with identical id attributes for two elements. PHPBB3/10067
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-052-1/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required. [ticket/10042] GD CAPTCHA: Round offset to the next pixel. [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
| * | | Merge branch 'ticket/bantu/10042' into develop-olympusNils Adermann2011-06-052-1/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10042: [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required. [ticket/10042] GD CAPTCHA: Round offset to the next pixel. [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
| | * | | [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.Andreas Fischer2011-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10042
| | * | | [ticket/10042] GD CAPTCHA: Round offset to the next pixel.Andreas Fischer2011-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10042
| | * | | [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.Andreas Fischer2011-03-051-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-10042
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-2/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10067] Clarify language for user activation options in ACP.
| * | | | Merge branch 'ticket/p/10067' into develop-olympusNils Adermann2011-06-051-2/+8
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * ticket/p/10067: [ticket/10067] Clarify language for user activation options in ACP.
| | * | | [ticket/10067] Clarify language for user activation options in ACP.Oleg Pudeyev2011-04-301-2/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10067
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-053-7/+34
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10158] Remove some code duplication from generating the message. [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed. [ticket/10158] Only view "Return to" links if they are useful. [ticket/10158] Add return-link to folder, when the user replied from a folder. [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
| * | | | Merge branch 'ticket/nickvergessen/10158' into develop-olympusNils Adermann2011-06-052-7/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/10158: [ticket/10158] Remove some code duplication from generating the message. [ticket/10158] Only view "Return to" links if they are useful. [ticket/10158] Add return-link to folder, when the user replied from a folder. [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
| | * | | | [ticket/10158] Remove some code duplication from generating the message.Nils Adermann2011-06-051-28/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10158
| | * | | | [ticket/10158] Only view "Return to" links if they are useful.Joas Schilling2011-05-231-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10158
| | * | | | [ticket/10158] Add return-link to folder, when the user replied from a folder.Joas Schilling2011-05-092-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10158
| | * | | | [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.Joas Schilling2011-05-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10158
| * | | | | Merge branch 'ticket/bantu/10195' into develop-olympusNils Adermann2011-06-051-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10195: [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
| | * | | | | [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.Andreas Fischer2011-05-261-0/+6
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | There is no support for IPv6 addresses in the blacklists we check right now. PHPBB3-10195
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-031-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9950] Use actual language instead of user's language in overall header
| * | | | | Merge remote-tracking branch 'naderman/ticket/9950' into develop-olympusAndreas Fischer2011-06-031-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/9950: [ticket/9950] Use actual language instead of user's language in overall header
| | * | | | | [ticket/9950] Use actual language instead of user's language in overall headerNils Adermann2011-06-021-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-9950
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-022-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9685] Test for databases that are able to nest transactions [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
| * | | | | [ticket/9685] Consistently name the new sql_buffer_nested_transactions functionNils Adermann2011-06-022-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9685
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
| * | | | Merge remote-tracking branch 'p/ticket/10191' into develop-olympusAndreas Fischer2011-05-231-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10191: [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
| | * | | | [ticket/10191] Use ob_get_level in exit_handler for output buffering check.Oleg Pudeyev2011-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling flush() when output buffering is enabled causes output to be duplicated. Besides phpBB enabling output buffering for gzip compression, output buffering may be enabled externally to phpBB via output_handler or output_buffering directives in php.ini. Use ob_get_level to determine whether output buffering is active and call ob_flush in that case. PHPBB3-10191
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
| * | | | | [ticket/10188] Use ob_get_level in msg_handler for output buffering check.Oleg Pudeyev2011-05-221-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output buffering may be enabled via various approaches, among them: * output_buffering in php.ini; * output_handler in php.ini enables output_buffering; * ob_start call. ob_get_level allows us to query php runtime for the actual output buffering status. PHPBB3-10188
| * | | | Merge remote-tracking branch 'bantu/ticket/10146' into develop-olympusOleg Pudeyev2011-05-131-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10146: [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
| | * | | | [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).Andreas Fischer2011-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10146
* | | | | | Merge remote-tracking branch 'p/ticket/10156' into developAndreas Fischer2011-05-231-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10156: [ticket/10156] Fix new cron on windows.
| * | | | | | [ticket/10156] Fix new cron on windows.Oleg Pudeyev2011-05-191-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10156
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-203-1/+50
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php
| * | | | | | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-203-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | | | | | | Merge remote-tracking branch 'bantu/ticket/10146-develop' into developOleg Pudeyev2011-05-131-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10146-develop: [ticket/10146] Fix Firebird DECIMAL precision issue on develop.
| * | | | | | | [ticket/10146] Fix Firebird DECIMAL precision issue on develop.Andreas Fischer2011-05-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10146
* | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-101-4/+9
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10170] Fix broken recaptcha verification host. [ticket/10170] Include www in hostname in language strings. [ticket/10170] Update language entries [ticket/10170] reCaptcha API has been moved.
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympusOleg Pudeyev2011-05-101-4/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10170: [ticket/10170] Fix broken recaptcha verification host. [ticket/10170] Include www in hostname in language strings. [ticket/10170] Update language entries [ticket/10170] reCaptcha API has been moved.
| | * | | | | | | [ticket/10170] Fix broken recaptcha verification host.Andreas Fischer2011-05-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10170
| | * | | | | | | [ticket/10170] reCaptcha API has been moved.Erik Frèrejean2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reCaptcha API has been moved from recaptcha.net to google.com/recaptcha. PHPBB3-10170
* | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-091-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common. [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
| * | | | | | | [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 remote-tracking branch 'p/ticket/9693' into developAndreas Fischer2011-05-051-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9693: [ticket/9693] Removed useless $auth globalizations.
| * | | | | | | | [ticket/9693] Removed useless $auth globalizations.Oleg Pudeyev2011-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9693
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-05-051-4/+258
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | | | | | | | 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.