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
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
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
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
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
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
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
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
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
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
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
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
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
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
Andreas Fischer
ccb78f74a4
[ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
...
PHPBB3-9999
2011-05-09 23:20:17 +02:00
Andreas Fischer
4038091382
[ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
...
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
2011-05-09 23:11:56 +02:00
Andreas Fischer
2d35e60443
[ticket/10154] Move "copy permissions from" to below "parent" on forum creation
...
Move "copy permissions from" to below "parent forum" in forum creation form.
PHPBB3-10154
2011-05-09 22:53:08 +02:00
Nils Adermann
e7dd37910c
Merge branch 'ticket/p/10003' into develop-olympus
...
* 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.
2011-05-05 14:44:49 +02:00
Oleg Pudeyev
3a70cb478c
Merge remote-tracking branch 'erikfrerejean/ticket/9954' into develop-olympus
...
* erikfrerejean/ticket/9954:
[ticket/9954] Remove unneeded never permission
2011-05-03 00:24:44 -04:00
Oleg Pudeyev
c651948cb3
[ticket/9630] Make language for moving posts clearer in quickmod/mcp.
...
PHPBB3-9630
2011-05-02 23:54:35 -04:00
Oleg Pudeyev
aa7be58d41
Merge branch 'erikfrerejean/ticket/9961' into develop-olympus
...
* erikfrerejean/ticket/9961:
[ticket/9961] Create log entries when users are activated.
2011-04-30 17:41:04 -04:00
Oleg Pudeyev
1e2c19f4b4
[ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
...
PHPBB3-10003
2011-04-29 02:16:02 -04:00
Oleg Pudeyev
85549fad83
[ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.
...
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
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
55ff5da70b
[ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.
...
The diff in database_update was only partially relevant.
PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
761e3dd36f
[ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.
...
This was painful. Git wanted to patch hunks in wrong places.
Hopefully I got it right.
PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
9f34aa0b79
[ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.
...
This diff applied cleanly.
PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
3cb1b90ca6
[ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.
...
This change is somewhat questionable, maybe it should be reviewed.
PHPBB3-10003
2011-04-29 02:10:41 -04:00
Oleg Pudeyev
e6eb11bb11
[ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
...
PHPBB3-10003
2011-04-29 02:10:41 -04:00
Igor Wiedler
850741ee16
Merge remote branch 'bantu/ticket/10145' into develop-olympus
...
* bantu/ticket/10145:
[ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
2011-04-26 21:49:21 +02:00
Andreas Fischer
569a4b2091
Merge remote branch 'p/ticket/7941' into develop-olympus
...
* p/ticket/7941:
[ticket/7941] Added @return to generate_board_url docstring.
2011-04-26 19:35:49 +02:00
Andreas Fischer
a3a70e13b5
[ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
...
PHPBB3-10145
2011-04-26 12:35:44 +02:00
Andreas Fischer
8a97722464
Merge branch 'ticket/p/10147' into develop-olympus
...
* ticket/p/10147:
[ticket/10147] Corrected a typo in includes/functions_template.php.
2011-04-23 21:51:49 +02:00
Oleg Pudeyev
a8ecd30fe1
[ticket/10147] Corrected a typo in includes/functions_template.php.
...
PHPBB3-10147
2011-04-23 15:36:45 -04:00
Andreas Fischer
bc48fe1704
Merge branch 'ticket/p/10141' into develop-olympus
...
* ticket/p/10141:
[ticket/10141] Save a hash lookup when value is not in cache.
[ticket/10141] Split double-assignment into conditional and unconditional part.
[ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
2011-04-22 11:16:32 +02:00
Andreas Fischer
9cb6a69861
[ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
...
PHPBB3-10146
2011-04-22 11:01:07 +02:00
Oleg Pudeyev
0a8893498d
Merge branch 'ticket/bantu/10137' into develop-olympus
...
* ticket/bantu/10137:
[ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
2011-04-22 00:16:21 -04:00
Oleg Pudeyev
f49656986c
[ticket/10141] Save a hash lookup when value is not in cache.
...
PHPBB3-10141
2011-04-21 23:15:51 -04:00
Andreas Fischer
8c3cfbb40e
[ticket/10105] Update AIM express link.
...
PHPBB3-10105
2011-04-22 00:42:49 +02:00
Andreas Fischer
78fa3a3b03
[ticket/10105] Update AIM application download link.
...
PHPBB3-10105
2011-04-22 00:41:55 +02:00
Andreas Fischer
6ee6245e5b
[ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
...
PHPBB3-10137
2011-04-22 00:30:13 +02:00