1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 22:26:32 +02:00
Commit Graph

4434 Commits

Author SHA1 Message Date
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
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
324c913ac9 [ticket/9950] Use actual language instead of user's language in overall header
PHPBB3-9950
2011-06-02 06:24:28 +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
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful.
PHPBB3-10158
2011-05-23 12:03:04 +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
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
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
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
eded608a53 [ticket/10170] Fix broken recaptcha verification host.
PHPBB3-10170
2011-05-11 03:26:36 +02:00
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
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
437013194a [ticket/10158] Add return-link to folder, when the user replied from a folder.
PHPBB3-10158
2011-05-09 12:46:34 +02:00
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 1802b9ff92 to db_tools.
  [ticket/10003] Ported 5553cfc2ed to db_tools.
  [ticket/10003] Ported 023760c8b2 to db_tools.
  [ticket/10003] Ported 54c22ae52a to db_tools.
  [ticket/10003] Ported 96a30afcca to db_tools.
  [ticket/10003] Ported d7d96223e7 to db_tools.
2011-05-05 14:44:49 +02:00
65d956bd81 [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
PHPBB3-10158
2011-05-05 10:49:54 +02:00
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
1e2c19f4b4 [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
PHPBB3-10003
2011-04-29 02:16:02 -04:00
85549fad83 [ticket/10003] Ported 1802b9ff92 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
55ff5da70b [ticket/10003] Ported 5553cfc2ed to db_tools.
The diff in database_update was only partially relevant.

PHPBB3-10003
2011-04-29 02:10:42 -04:00
761e3dd36f [ticket/10003] Ported 023760c8b2 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
9f34aa0b79 [ticket/10003] Ported 54c22ae52a to db_tools.
This diff applied cleanly.

PHPBB3-10003
2011-04-29 02:10:42 -04:00
3cb1b90ca6 [ticket/10003] Ported 96a30afcca to db_tools.
This change is somewhat questionable, maybe it should be reviewed.

PHPBB3-10003
2011-04-29 02:10:41 -04:00
e6eb11bb11 [ticket/10003] Ported d7d96223e7 to db_tools.
PHPBB3-10003
2011-04-29 02:10:41 -04:00
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
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
a3a70e13b5 [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
PHPBB3-10145
2011-04-26 12:35:44 +02:00
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
a8ecd30fe1 [ticket/10147] Corrected a typo in includes/functions_template.php.
PHPBB3-10147
2011-04-23 15:36:45 -04:00
9cb6a69861 [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
PHPBB3-10146
2011-04-22 11:01:07 +02:00
f49656986c [ticket/10141] Save a hash lookup when value is not in cache.
PHPBB3-10141
2011-04-21 23:15:51 -04:00
b1367bce48 [ticket/10141] Split double-assignment into conditional and unconditional part.
PHPBB3-10141
2011-04-22 00:20:09 +02:00
11dd4b54fa [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
Many sequences being converted are the same. Use a local cache to
convert each sequence once, speeding up the function.

PHPBB3-10141
2011-04-21 04:21:09 -04:00
1d2201902f [ticket/9961] Create log entries when users are activated.
* Create log entries when a user activates own account without
   also changing their password.

 * Additionally create admin log entries when an administrator activates
   user accounts.

PHPBB3-9961
2011-04-19 13:11:20 +02:00
682814180c [ticket/7941] Added @return to generate_board_url docstring.
PHPBB3-7941
2011-04-17 18:46:03 -04:00
32bc980ca0 Merge branch 'ticket/nickvergessen/10109' into develop-olympus
* ticket/nickvergessen/10109:
  [ticket/10109] Fix "Undefined Index" errors when copying a topic.
2011-04-17 03:20:22 -04:00
76bc4c24a5 Merge branch 'ticket/rxu/10117' into develop-olympus
* ticket/rxu/10117:
  [ticket/10117] Add one more missed 'u' modifier, add code comment
  [ticket/10117] Make smilies to be correctly parsed within unicode text.
2011-04-17 00:31:24 -04:00
d4e938b25b Merge branch 'ticket/rxu/10115' into develop-olympus
* ticket/rxu/10115:
  [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes
  [ticket/10115] Make some text oriented BBCodes to properly handle unicode.
2011-04-17 00:12:40 -04:00
bdb84452f5 Merge branch 'ticket/bantu/10128' into develop-olympus
* ticket/bantu/10128:
  [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
2011-04-10 19:52:06 -04:00
259929ad4e [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
The user_ban() function is shared by the MCP and the ACP.

Mark trigger_error() calls as errors by passing E_USER_WARNING to make the
error message appear on red background (instead of green background) in the
ACP.

PHPBB3-10128
2011-04-11 00:29:48 +02:00
d3b5df2548 Merge branch 'ticket/erikfrerejean/9581' into develop-olympus
* ticket/erikfrerejean/9581:
  [ticket/9581] Fix missing index
  [ticket/9581] Slightly tweaked queries
  [ticket/9581] Make banlist table select optional
  [ticket/9581] Mass e-mail to banned users
2011-04-10 11:58:29 -04:00
851bb9fcd8 [ticket/10084] Add smilie/icon errors out when file is missing
PHPBB3-10084
2011-04-07 20:36:11 +02:00
a72fe8acaf [ticket/10109] Fix "Undefined Index" errors when copying a topic.
PHPBB3-10109
2011-04-07 14:53:47 +02:00
59d75c1ae6 [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
PHPBB3-10121
2011-04-03 22:11:13 +02:00
rxu
b8adad0d48 [ticket/10117] Add one more missed 'u' modifier, add code comment
PHPBB3-10117
2011-04-03 15:28:00 +08:00
rxu
6ddb92c41e [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes
PHPBB3-10115
2011-04-03 08:33:33 +08:00
rxu
25ae46b8df [ticket/10117] Make smilies to be correctly parsed within unicode text.
PHPBB3-10117
2011-04-03 00:53:00 +08:00