mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 19:45:10 +01:00
Code Issues Releases Wiki Activity
11,198 Commits 17 Branches 190 Tags
Commit Graph

11198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Nils Adermann
57eb02bf2c [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar 
PHPBB3-10149
 2011-06-03 02:39:00 +02:00
Andreas Fischer
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
Andreas Fischer
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
Nils Adermann
324c913ac9 [ticket/9950] Use actual language instead of user's language in overall header 
PHPBB3-9950
 2011-06-02 06:24:28 +02:00
Nils Adermann
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
Nils Adermann
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
Nils Adermann
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
Nils Adermann
ebe83769e6 [ticket/9685] Consistently name the new sql_buffer_nested_transactions function 
PHPBB3-9685
 2011-06-02 01:52:25 +02:00
Andreas Fischer
9c04aef153 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10192] Add missing semicolon
 2011-05-23 23:59:56 +02:00
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Erik Frèrejean
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Joas Schilling
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
Oleg Pudeyev
f231590c7b [ticket/10156] Fix new cron on windows. 
PHPBB3-10156
 2011-05-19 22:34:18 -04:00
Oleg Pudeyev
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
Patrick Webster
94c28efe07 [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter. 
PHPBB3-10039
 2011-05-13 19:43:17 -04:00
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Andreas Fischer
1f4b4aee9d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10186] UCP signature panel displays when not authed for signatures
 2011-05-13 01:29:57 +02:00
Andreas Fischer
46110d8cef Merge remote-tracking branch 'p/ticket/10186' into develop-olympus 
* p/ticket/10186:
  [ticket/10186] UCP signature panel displays when not authed for signatures
 2011-05-13 01:29:00 +02:00
RMcGirr83
f6fa52540c [ticket/10186] UCP signature panel displays when not authed for signatures 
The signature panel link was displayed even when a user did not have the
auths to create/edit their signature. Clicking on the link gave a
trigger_error of "Not authorised to have a signature". Hide the link
when user does not have permissions to edit their signature.

PHPBB3-10186
 2011-05-12 19:25:20 -04:00
Andreas Fischer
bfdb5c413d [ticket/10146] Fix Firebird DECIMAL precision issue on develop. 
PHPBB3-10146
 2011-05-11 11:32:09 +02:00
Andreas Fischer
6aa2f9e742 [ticket/10173] Use correct variable, checking for $birthday_year was correct. 
PHPBB3-10173
 2011-05-11 11:21:37 +02:00
Oleg Pudeyev
cc0e6e9912 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
 2011-05-10 23:46:24 -04:00
Oleg Pudeyev
0d407f10d0 Merge remote-tracking branch 'bantu/ticket/10126' into develop-olympus 
* bantu/ticket/10126:
  [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
 2011-05-10 23:42:22 -04:00
Oleg Pudeyev
3f9e9b581b Merge branch 'develop-olympus' into develop 
* 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.
 2011-05-10 23:32:27 -04:00
Oleg Pudeyev
f670aefd36 Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympus 
* 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.
 2011-05-10 22:06:23 -04:00
Andreas Fischer
5a4a1e3c25 [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting. 
Make what we want to achieve clear by using "and not" instead of "xor".

PHPBB3-10126
 2011-05-11 03:56:15 +02:00
Andreas Fischer
eded608a53 [ticket/10170] Fix broken recaptcha verification host. 
PHPBB3-10170
 2011-05-11 03:26:36 +02:00
Andreas Fischer
2c0c8a580f [ticket/10170] Include www in hostname in language strings. 
PHPBB3-10170
 2011-05-11 03:14:14 +02:00
Erik Frèrejean
46fcf9c8e4 [ticket/10170] Update language entries 
Update the language entries to reflect the reCaptcha
API change.

PHPBB3-10170
 2011-05-10 23:34:38 +02:00
Erik Frèrejean
ca981b6d18 [ticket/10170] reCaptcha API has been moved. 
The reCaptcha API has been moved from recaptcha.net to
google.com/recaptcha.

PHPBB3-10170
 2011-05-10 23:31:41 +02:00
Oleg Pudeyev
6ac6680639 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
 2011-05-09 22:36:47 -04:00
Oleg Pudeyev
7faabfb532 Merge remote-tracking branch 'bantu/ticket/10154' into develop-olympus 
* bantu/ticket/10154:
  [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
 2011-05-09 22:35:19 -04:00
Oleg Pudeyev
7cbbb301e1 Merge branch 'develop-olympus' into develop 
* 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.
 2011-05-09 22:28:35 -04:00
Oleg Pudeyev
820ed7a17d Merge remote-tracking branch 'bantu/ticket/9999' into develop-olympus 
* bantu/ticket/9999:
  [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
  [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
 2011-05-09 22:24:10 -04:00