1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 14:16:28 +02:00
Commit Graph

11223 Commits

Author SHA1 Message Date
b87fcf70c0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
2011-06-09 01:22:45 +02:00
a7258fc6ce Merge remote-tracking branch 'nickvergessen/ticket/10203' into develop-olympus
* nickvergessen/ticket/10203:
  [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
2011-06-09 01:19:08 +02:00
d2b5d77b2c [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
PHPBB3-10203
2011-06-09 00:33:27 +02:00
ad90f262ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10067] Add separator to h_radio to place options on individual lines

Conflicts:
	phpBB/adm/index.php
2011-06-06 11:06:01 +02:00
759f8d5c2c Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympus
* naderman/ticket/10067:
  [ticket/10067] Add separator to h_radio to place options on individual lines
2011-06-06 10:58:05 +02:00
26e052bb26 [ticket/10067] Add separator to h_radio to place options on individual lines
The previous mechanism for account activation resulted in two h_radio calls
with identical id attributes for two elements.

PHPBB3/10067
2011-06-05 09:52:17 +02:00
b55bfb459e Merge branch 'develop-olympus' into develop
* 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.
2011-06-05 03:22:40 +02:00
893d0ae96f Merge branch 'ticket/bantu/10042' into develop-olympus
* 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.
2011-06-05 03:22:09 +02:00
0a1e7ca02b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9922] Link post subject to the post's anchor in subsilver2.
2011-06-05 03:06:31 +02:00
ffc137986f Merge branch 'ticket/bantu/9922' into develop-olympus
* ticket/bantu/9922:
  [ticket/9922] Link post subject to the post's anchor in subsilver2.
2011-06-05 03:00:56 +02:00
cc14f4b9e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10067] Clarify language for user activation options in ACP.
2011-06-05 02:50:17 +02:00
a9f4e00234 Merge branch 'ticket/p/10067' into develop-olympus
* ticket/p/10067:
  [ticket/10067] Clarify language for user activation options in ACP.
2011-06-05 02:49:35 +02:00
a30ec6e052 Merge branch 'develop-olympus' into develop
* 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.
2011-06-05 01:58:52 +02:00
27e1f1319f Merge branch 'ticket/nickvergessen/10158' into develop-olympus
* 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.
2011-06-05 01:58:37 +02:00
6b6705b852 [ticket/10158] Remove some code duplication from generating the message.
PHPBB3-10158
2011-06-05 01:58:03 +02:00
b1ae6f6407 Merge branch 'ticket/bantu/10195' into develop-olympus
* ticket/bantu/10195:
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
2011-06-05 01:30:26 +02:00
c504888f03 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
2011-06-03 12:54:37 +02:00
116744d4e5 Merge remote-tracking branch 'naderman/ticket/10149' into develop-olympus
* naderman/ticket/10149:
  [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
2011-06-03 12:53:50 +02:00
ab366a18ba Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9950] Use actual language instead of user's language in overall header
2011-06-03 11:00:26 +02:00
7a2fb9f123 Merge remote-tracking branch 'naderman/ticket/9950' into develop-olympus
* naderman/ticket/9950:
  [ticket/9950] Use actual language instead of user's language in overall header
2011-06-03 10:58:18 +02:00
57eb02bf2c [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
PHPBB3-10149
2011-06-03 02:39:00 +02:00
672c333ace Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9685] Test for databases that are able to nest transactions
  [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
2011-06-02 23:32:12 +02:00
b1a4de3166 Merge remote-tracking branch 'naderman/ticket/9685' into develop-olympus
* naderman/ticket/9685:
  [ticket/9685] Test for databases that are able to nest transactions
  [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
2011-06-02 23:30:09 +02:00
324c913ac9 [ticket/9950] Use actual language instead of user's language in overall header
PHPBB3-9950
2011-06-02 06:24:28 +02:00
f0287f7e57 [ticket/9685] Test for databases that are able to nest transactions
If a database is unable to nest transactions the dbal should implement
sql_buffer_nested_transactions to signal that buffering of the outer
results and closing of the outer transaction is required to open the
inner transaction.

PHPBB3-9685
2011-06-02 06:09:21 +02:00
ed95c7195f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
2011-06-02 04:53:48 +02:00
2159e4f285 Merge branch 'ticket/p/10039' into develop-olympus
* ticket/p/10039:
  [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
2011-06-02 04:52:30 +02:00
ebe83769e6 [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
PHPBB3-9685
2011-06-02 01:52:25 +02:00
83dfe0d22c [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
There is no support for IPv6 addresses in the blacklists we check right now.

PHPBB3-10195
2011-05-26 10:56:46 +02:00
9c04aef153 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10192] Add missing semicolon
2011-05-23 23:59:56 +02:00
7da88f9103 Merge remote-tracking branch 'erikfrerejean/ticket/10192' into develop-olympus
* erikfrerejean/ticket/10192:
  [ticket/10192] Add missing semicolon
2011-05-23 23:59:45 +02:00
09776d2302 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:55 +02:00
e0ce73e3b8 Merge remote-tracking branch 'p/ticket/9630' into develop-olympus
* p/ticket/9630:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:31 +02:00
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful.
PHPBB3-10158
2011-05-23 12:03:04 +02:00
b5e5ed0033 [ticket/10192] Add missing semicolon
if the index has to be recreated it will run into the private message
table query.

PHPBB3-10192
2011-05-23 11:00:58 +02:00
93a8c54bcb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
2011-05-23 10:20:59 +02:00
e4681f0929 Merge remote-tracking branch 'p/ticket/10191' into develop-olympus
* p/ticket/10191:
  [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
2011-05-23 10:18:49 +02:00
fe3f3bc839 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
2011-05-23 10:17:26 +02:00
00a4ace573 Merge remote-tracking branch 'p/ticket/10188' into develop-olympus
* p/ticket/10188:
  [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
2011-05-23 10:14:40 +02:00
0aa6398163 Merge remote-tracking branch 'p/ticket/10156' into develop
* p/ticket/10156:
  [ticket/10156] Fix new cron on windows.
2011-05-23 10:13:08 +02:00
44cc8153cd [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
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
2011-05-22 07:16:40 -04:00
9b62500a10 [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
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
2011-05-22 06:48:59 -04:00
f9307531a7 Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542:
  [ticket/8542] Display custom profile fields in private messages

Conflicts:
	phpBB/install/database_update.php
2011-05-20 19:50:29 -04:00
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
2011-05-20 16:45:29 +02:00
f231590c7b [ticket/10156] Fix new cron on windows.
PHPBB3-10156
2011-05-19 22:34:18 -04:00
52c4726b5b Merge remote-tracking branch 'bantu/ticket/10173' into develop
* bantu/ticket/10173:
  [ticket/10173] Use correct variable, checking for $birthday_year was correct.
  [ticket/10173] Only calculate age if year is not false as per nn-.
  [ticket/10173] Use an array for the legacy birthday list as per rxu.
  [ticket/10173] Use a loop var for the birthdays list to allow proper templating
2011-05-15 02:15:16 -04:00
94c28efe07 [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
PHPBB3-10039
2011-05-13 19:43:17 -04:00
457758ef4a Merge remote-tracking branch 'bantu/ticket/10146-develop' into develop
* bantu/ticket/10146-develop:
  [ticket/10146] Fix Firebird DECIMAL precision issue on develop.
2011-05-13 19:35:09 -04:00
1c90fc6a72 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).

Merged with -X ours, develop-olympus fix for PHPBB3-10146 does not apply
to develop.
2011-05-13 19:33:50 -04:00
5e81b058cf Merge remote-tracking branch 'bantu/ticket/10146' into develop-olympus
* bantu/ticket/10146:
  [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
2011-05-13 19:32:35 -04:00