Nils Adermann
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
Nils Adermann
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
Nils Adermann
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
Nils Adermann
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
Nils Adermann
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
Nils Adermann
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
Nils Adermann
6b6705b852
[ticket/10158] Remove some code duplication from generating the message.
...
PHPBB3-10158
2011-06-05 01:58:03 +02:00
Nils Adermann
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
Nils Adermann
f11ef89c65
[ticket/8138] Add autocomplete="off" to acp_board and ldap settings
...
PHPBB3-8138
2011-06-03 19:06:12 +02:00
Nils Adermann
4ddd116cd4
[ticket/8138] Add autocomplete="off" to a user and forum ACP.
...
PHPBB3-8138
2011-06-03 18:59:24 +02:00
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
6e8b59dce3
[ticket/7057] Use GET for quicksearch and add session id to hidden fields
...
Without sid a GET form logs a user out if they have cookies disabled.
PHPBB3-7057
2011-06-02 10:10:42 +02:00
Nils Adermann
d270f736e3
[ticket/7057] Remove trailing whitespace in functions.php
...
PHPBB3-7057
2011-06-02 10:09:40 +02:00
Nils Adermann
7b10f859de
[ticket/10005] Add validation of dropdown custom profile field values
...
PHPBB3-10005
2011-06-02 08:49:59 +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
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
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
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
Joas Schilling
67449f8f1b
[ticket/10158] Only view "Return to" links if they are useful.
...
PHPBB3-10158
2011-05-23 12:03:04 +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
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
6ae5a64f6c
[feature/template-engine] Fixed absolute path PHP includes, added test.
...
PHPBB3-9726
2011-05-19 12:18:16 -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
Oleg Pudeyev
7d911e0bc1
[feature/template-engine] Delete @version everywhere.
...
This is not used since the switch to git.
PHPBB3-9726
2011-05-14 15:30:20 -04:00
Oleg Pudeyev
70ccf04e06
[feature/template-engine] Moved phpbb_template_filter into own file.
...
PHPBB3-9726
2011-05-14 15:30:20 -04:00
Oleg Pudeyev
b04f0a5f70
[feature/template-engine] Delete @access everywhere.
...
Access specification in php 5 is done directly on functions/properties.
PHPBB3-9726
2011-05-14 15:30:20 -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
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
Oleg Pudeyev
94560d7086
[feature/template-engine] Make INCLUDEPHP relative to board root.
...
PHPBB3-9726
2011-05-12 20:13:32 -04:00
Oleg Pudeyev
d2ac05aa74
[feature/template-engine] Replaced globals with dependency injection.
...
PHPBB3-9726
2011-05-12 20:13:31 -04:00