mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
10,652 Commits 17 Branches 190 Tags
Commit Graph

10652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nils Adermann
dda1e13126 Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus 
* github-bantu/ticket/10278:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
 2011-10-14 02:47:45 +02:00
Andreas Fischer
4e69fe6859 Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympus 
* igorw/ticket/10307:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
 2011-10-13 23:44:42 +02:00
Andreas Fischer
e43b7813a5 Merge remote-tracking branch 'igorw/ticket/10246' into develop-olympus 
* igorw/ticket/10246:
  [ticket/10246] Move coding guidelines VCS section to wiki
 2011-10-13 18:29:17 +02:00
Andreas Fischer
1dc1583b92 [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. 
PHPBB3-10278
 2011-10-13 18:23:33 +02:00
Andreas Fischer
091119605a [ticket/10278] Also timeout when receiving data over a slow connection. 
PHPBB3-10278
 2011-10-13 18:03:02 +02:00
Igor Wiedler
75ef0fde82 [ticket/10246] Move coding guidelines VCS section to wiki 
The VCS section can now be found at:
* http://wiki.phpbb.com/Git#Branches

PHPBB3-10246
 2011-10-13 17:43:59 +02:00
Andreas Fischer
b957639abb Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympus 
* igorw/ticket/8094:
  [ticket/8094] Remove ambiguity of "phpBB has no categories"
 2011-10-13 17:25:10 +02:00
Andreas Fischer
8017469e59 Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympus 
* igorw/ticket/10275:
  [ticket/10275] Remove incorrect password information from FAQ
 2011-10-13 17:20:52 +02:00
Andreas Fischer
57d157a723 Merge remote-tracking branch 'igorw/ticket/9898' into develop-olympus 
* igorw/ticket/9898:
  [ticket/9898] Encourage patches in README
 2011-10-13 17:16:20 +02:00
Andreas Fischer
3a92623dfa Merge remote-tracking branch 'nickvergessen/ticket/10408' into develop-olympus 
* nickvergessen/ticket/10408:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
 2011-10-13 17:09:48 +02:00
Igor Wiedler
ee91656968 [ticket/10275] Remove incorrect password information from FAQ 
FAQ contains instructions to find the password in the registration
e-mail. We no longer send the password on registration. So let's just
remove this incorrect piece of information from the FAQ.

PHPBB3-10275
 2011-10-13 17:09:34 +02:00
Andreas Fischer
4c1bde350a Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympus 
* nickvergessen/ticket/10304:
  [ticket/10304] Fix URL for ICQ while view private messages
 2011-10-13 17:07:28 +02:00
Andreas Fischer
4b42646f36 Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympus 
* nickvergessen/ticket/10400:
  [ticket/10400] Allow forum name to be '0'
 2011-10-13 17:05:01 +02:00
Igor Wiedler
6d9e9d1901 [ticket/10307] Add a test for PHPBB3-10307 
PHPBB3-10307
 2011-10-13 16:57:42 +02:00
Igor Wiedler
3cd8c2507d [ticket/10307] Return false in mysqli sql_fetchrow on empty result 
PHPBB3-10307
 2011-10-13 16:43:11 +02:00
Igor Wiedler
6698a9cbd6 [ticket/8094] Remove ambiguity of "phpBB has no categories" 
PHPBB3-8094
 2011-10-13 16:25:41 +02:00
Joas Schilling
88aacd0f2c [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP 
PHPBB3-10408
 2011-10-13 15:52:12 +02:00
Joas Schilling
b515f5462e Merge remote-tracking branch 'remotes/cyberalien/ticket/10397' into develop-olympus 2011-10-13 14:37:45 +02:00
Joas Schilling
f94f872624 [ticket/10304] Fix URL for ICQ while view private messages 
PHPBB3-10304
 2011-10-13 13:59:39 +02:00
Igor Wiedler
d4bbfae0d5 [ticket/9898] Encourage patches in README 
PHPBB3-9898
 2011-10-13 11:53:25 +02:00
Joas Schilling
cacb9f2ec5 [ticket/10400] Allow forum name to be '0' 
PHPBB3-10400
 2011-10-07 09:44:31 +02:00
Vjacheslav Trushkin
b38fbc6d25 [ticket/10397] Pagination inconsistency fix 
Fixing topic_generate_pagination()

PHPBB3-10397
 2011-10-04 12:24:42 +03:00
Vjacheslav Trushkin
12882084d4 [ticket/10397] Pagination inconsistency fix 
Fixing inconsistency in code generated by generate_pagination()

PHPBB3-10397
 2011-10-04 11:55:25 +03:00
Andreas Fischer
86f8851c40 Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympus 
* naderman/ticket/10394:
  [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
 2011-09-27 22:39:30 +02:00
Nils Adermann
b197ea56c2 [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function 
PHPBB3-10394
 2011-09-27 22:32:20 +02:00
Andreas Fischer
dad7aa9593 Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympus 
* nickvergessen/ticket/10315:
  [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
 2011-09-27 20:57:55 +02:00
Andreas Fischer
13b718e720 Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympus 
* naderman/ticket/10394:
  [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
 2011-09-27 20:21:57 +02:00
Nils Adermann
b571b3e032 [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4 
PHPBB3-10394
 2011-09-27 17:31:24 +02:00
Joas Schilling
5b66413f69 [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping 
PHPBB3-10315
 2011-09-21 01:02:28 +02:00
Nils Adermann
cc2ecc9171 Merge remote-tracking branch 'github-bantu/ticket/10370' into develop-olympus 
* github-bantu/ticket/10370:
  [ticket/10370] Add function documentation for get_stacktrace().
  [ticket/10370] Explain that we are not the ones hiding backtrace pieces.
  [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path().
  [ticket/10370] Add require_once to whitelisted functions.
  [ticket/10370] Use single string instead of an array for arguments.
  [ticket/10370] Ease up code checking for arguments of include etc.
  [ticket/10370] Use unset() on the first backtrace instead of checking in loop.
  [ticket/10370] Use phpbb_filter_root_path() in get_backtrace().
 2011-09-19 17:53:55 +02:00
Andreas Fischer
79ad3a3f32 [ticket/10370] Add function documentation for get_stacktrace(). 
PHPBB3-10370
 2011-09-19 17:45:32 +02:00
Andreas Fischer
fc2af460ee [ticket/10370] Explain that we are not the ones hiding backtrace pieces. 
Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d.

PHPBB3-10370
 2011-09-19 17:37:16 +02:00
Andreas Fischer
19ce73c884 [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path(). 
PHPBB3-10370
 2011-09-19 17:37:16 +02:00
Andreas Fischer
8a84f42f7d [ticket/10370] Add require_once to whitelisted functions. 
PHPBB3-10370
 2011-09-19 17:37:15 +02:00
Andreas Fischer
7965387201 [ticket/10370] Use single string instead of an array for arguments. 
PHPBB3-10370
 2011-09-19 17:37:15 +02:00
Andreas Fischer
0df7e5eefa [ticket/10370] Ease up code checking for arguments of include etc. 
PHPBB3-10370
 2011-09-19 17:37:10 +02:00
Andreas Fischer
12530a763b [ticket/10370] Use unset() on the first backtrace instead of checking in loop. 
PHPBB3-10370
 2011-09-19 16:58:25 +02:00
Andreas Fischer
9c0f75fd65 [ticket/10370] Use phpbb_filter_root_path() in get_backtrace(). 
PHPBB3-10370
 2011-09-19 16:57:09 +02:00
Nils Adermann
410028eecf Merge remote-tracking branch 'github-bantu/ticket/10245' into develop-olympus 
* github-bantu/ticket/10245:
  [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
 2011-09-18 23:25:04 +02:00
Nils Adermann
94fead702a Merge remote-tracking branch 'github-bantu/ticket/10369' into develop-olympus 
* github-bantu/ticket/10369:
  [ticket/10369] Replace root path with "[ROOT]" as per IRC.
  [ticket/10369] Add warning about paths outside of phpBB root not being filtered
  [ticket/10369] Rename filter_errfile() to filter_root_path().
  [ticket/10369] DRY code to remove phpbb path from errfile.
  [ticket/10369] Always include errfile and errline in format_errors().
 2011-09-18 23:20:45 +02:00
Andreas Fischer
1b390f0b49 [ticket/10369] Replace root path with "[ROOT]" as per IRC. 
PHPBB3-10369
 2011-09-18 23:03:28 +02:00
Andreas Fischer
c8564e6ce9 [ticket/10369] Add warning about paths outside of phpBB root not being filtered 
PHPBB3-10369
 2011-09-18 22:41:02 +02:00
Andreas Fischer
1ad97424a4 [ticket/10369] Rename filter_errfile() to filter_root_path(). 
PHPBB3-10369
 2011-09-18 22:32:25 +02:00
Andreas Fischer
9006984d5a [ticket/10369] DRY code to remove phpbb path from errfile. 
PHPBB3-10369
 2011-09-18 22:24:14 +02:00
Andreas Fischer
7b3f6cb219 [ticket/10369] Always include errfile and errline in format_errors(). 
We remove the phpBB root path from errfile. This is consistent with how
msg_handler handles E_WARNING messages etc.

PHPBB3-10369
 2011-09-18 22:23:41 +02:00
Andreas Fischer
05515e0510 [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean(). 
PHPBB3-10245
 2011-09-18 22:04:34 +02:00
Andreas Fischer
eb8b1c333f Merge remote-tracking branch 'galaxyAbstractor/ticket/10324' into develop-olympus 
* galaxyAbstractor/ticket/10324:
  [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
 2011-09-17 23:34:30 +02:00
galaxyAbstractor
94a0b7ef2e [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme 
Replaced the deprecated align and width attributes with CSS.

PHPBB3-10324
 2011-09-17 21:59:11 +02:00
Andreas Fischer
92373e6d46 Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympus 
* bantu/ticket/10294:
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
 2011-09-06 00:43:10 +02:00
Andreas Fischer
d28ec48675 Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympus 
* Noxwizard/ticket/10351:
  [ticket/10351] Fix Oracle's sql_column_remove()
 2011-09-06 00:42:48 +02:00