aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | [ticket/9949] $user->lang() uses last int-value to get the key not firstJoas Schilling2011-01-291-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The comment in the code says: "We now get the first number passed and will select the key based upon this number". But the loop over the arguments is not left and therefore it uses the last int-value not the first one. PHPBB3-9949
* | | | Merge branch 'ticket/nickvergessen/9966' into develop-olympusAndreas Fischer2011-02-041-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9966: [ticket/9966] Language download in ACP creates index.html and misses captcha_*
| * | | | [ticket/9966] Language download in ACP creates index.html and misses captcha_*Joas Schilling2011-01-291-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | The language pack download page includes index.html files instead of index.htm. It also does not include the new captcha_*.php files which are included since 3.0.6. PHPBB3-9966
* | | | [ticket/10020] Fix 32-bit php braindamage around INT_MIN.Oleg Pudeyev2011-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 32-bit php, -2147483648, despite fitting in the int type, is for some reason made into a floating-point value. Use an explicit cast to make it an integer. PHPBB3-10020
* | | | [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.Oleg Pudeyev2011-02-041-1/+2
| |/ / |/| | | | | | | | PHPBB3-10020
* | | Merge branch 'ticket/p/10014' into develop-olympusAndreas Fischer2011-02-011-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/p/10014: [ticket/10014] Clearly indicate fatal errors in file acm.
| * | | [ticket/10014] Clearly indicate fatal errors in file acm.Oleg Pudeyev2011-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If acm_file cannot open the cache file for writing, it prints a message to that effect and calls die(). The message itself does not indicate that it is a fatal error, and someone seeing the message might expect that inability to write to cache is not fatal. Make it clear that the error is fatal by printing the word "Fatal" before the message. PHPBB3-10014
* | | | Merge branch 'ticket/nickvergessen/9985' into develop-olympusAndreas Fischer2011-01-301-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9985: [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
| * | | | [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().Joas Schilling2011-01-301-2/+2
| | |/ / | |/| | | | | | | | | | PHPBB3-9985
* | | | Merge branch 'ticket/nickvergessen/9989' into develop-olympusAndreas Fischer2011-01-302-11/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * ticket/nickvergessen/9989: [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
| * | | [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.Joas Schilling2011-01-292-11/+5
| |/ / | | | | | | | | | PHPBB3-9989
* | | [ticket/9166] Fixed CSS element order in subsilver.Schnorrer422011-01-281-4/+10
| | | | | | | | | | | | PHPBB3-9166
* | | [ticket/9166] Fixed CSS element order in prosilver.Schnorrer422011-01-283-7/+25
|/ / | | | | | | PHPBB3-9166
* | [ticket/10007] Add directive 'internal' to blocked folders in nginx config.Andreas Fischer2011-01-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "deny" and "access" directives are IP-based in general. Both directives only support IPv6 from nginx 0.8.22 onwards, on older versions of nginx those directives have no effect on IPv6 requests. Thus they do not block access for IPv6 requests. Adding the "internal" directive blocks external access in general (both IPv4 and IPv6) and makes the web server return a status code 404 (Not Found) response. See: http://nginx.org/en/CHANGES http://wiki.nginx.org/HttpCoreModule#internal PHPBB3-10007
* | [ticket/8779] Slow search for 'View unread posts'rxu2011-01-241-2/+3
| | | | | | | | | | | | Adjust SQL query to speedup search for unread posts (thanks naderman). PHPBB3-8779
* | Merge branch 'ticket/bantu/9859' into develop-olympusNils Adermann2011-01-1628-150/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9859: [ticket/9859] Remove the years from the copyright statements in docs files. [ticket/9859] Remove the year from the copyright meta tag in docs/*.html [ticket/9859] Remove the meta copyright tag as well. [ticket/9859] Remove the credit line comment from all html files. [ticket/9859] Remove years in credit line from some more files.
| * | [ticket/9859] Remove the years from the copyright statements in docs files.Andreas Fischer2011-01-168-8/+8
| | | | | | | | | | | | PHPBB3-9859
| * | [ticket/9859] Remove the year from the copyright meta tag in docs/*.htmlAndreas Fischer2011-01-167-7/+7
| | | | | | | | | | | | PHPBB3-9859
| * | [ticket/9859] Remove the meta copyright tag as well.Andreas Fischer2011-01-165-5/+0
| | | | | | | | | | | | PHPBB3-9859
| * | [ticket/9859] Remove the credit line comment from all html files.Andreas Fischer2011-01-1611-116/+2
| | | | | | | | | | | | PHPBB3-9859
| * | [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-1614-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standard HTML output now includes: Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group Print output now includes: Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/ This also fixes an inconsistency where "phpBB Group" was linked instead of "phpBB". PHPBB3-9859
* | | [ticket/9933] Remove empty word check.rxu2011-01-161-5/+0
| | | | | | | | | | | | PHPBB3-9933
* | | [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().Andreas Fischer2011-01-161-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename $unicode to $unicode_support, pass in $use_unicode defaulting to true. In unit tests we can now pass in $use_unicode as false and also test the code path that is taken when PCRE does not support unicode. PHPBB3-9933
* | | [ticket/9933] Adjust word censor regex for non-unicode mode.rxu2011-01-161-4/+8
|/ / | | | | | | PHPBB3-9933
* | Merge branch 'ticket/bantu/9764' into develop-olympusIgor Wiedler2011-01-103-4/+4
|\ \ | |/ |/|
| * [ticket/9764] Allow $config['mime_triggers'] to be an empty string.Andreas Fischer2010-10-283-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explode('|', '') and explode('|', NULL) both return array(0 => '') which can cause filespec::check_content() to reject everything starting with a '<' character in case $config['mime_triggers'] is an empty string or not set. fileupload::set_disallowed_content() now filters out empty strings by calling array_diff() on the passed array, so setting $config['mime_triggers'] to an empty string will turn off mime checking completely. On the other side we want to fail safe if $config['mime_triggers'] is not set at all. To do this, the array fileupload::$disallowed_content now contains some default strings to be filtered out. PHPBB3-9764
* | [ticket/9933] Move word censor regex into separate function in functions.phprxu2011-01-072-18/+43
| | | | | | | | PHPBB3-9933
* | [ticket/9933] Wrong handling consecutive multiple asterisks in word censorrxu2011-01-072-2/+5
| | | | | | | | | | | | Fix consecutive asterisks issue in word censor. PHPBB3-9933
* | Merge branch 'ticket/bantu/9589' into develop-olympusAndreas Fischer2011-01-051-0/+0
|\ \ | | | | | | | | | | | | * ticket/bantu/9589: [ticket/9589] nginx.conf.sample -> nginx.sample.conf
| * | [ticket/9589] nginx.conf.sample -> nginx.sample.confAndreas Fischer2011-01-051-0/+0
| | | | | | | | | | | | PHPBB3-9589
* | | Merge branch 'ticket/bantu/9859' into develop-olympusAndreas Fischer2010-12-292-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9859: [ticket/9859] Remove years from the credit line.
| * | | [ticket/9859] Remove years from the credit line.Andreas Fischer2010-12-162-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9859
* | | | Merge branch 'ticket/bantu/9348' into develop-olympusAndreas Fischer2010-12-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9348: [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
| * | | | [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.Richard Foote2010-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call phpbb_set_encoding() on 'default_dateformat' to properly re-encode non-ascii characters that might be in default_dateformat. E.g. "d M Y à H:i" PHPBB3-9348
* | | | | Merge branch 'ticket/noxwizard/9953' into develop-olympusAndreas Fischer2010-12-292-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/noxwizard/9953: [ticket/9953] Set focus to password on re-authentication
| * | | | | [ticket/9953] Set focus to password on re-authenticationPatrick Webster2010-12-282-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets the login focus to the password field when prompting for admin re-authentication, rather than the username field. PHPBB3-9953
* | | | | [ticket/9905] Add SQLite to the DSN descriptionPatrick Webster2010-12-281-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The installer's DSN field has additional meanings for ODBC, PostgreSQL, and SQLite, but only the first two are mentioned. SQLite uses it for the file path. PHPBB3-9905
* | | | [ticket/9937] Make sure feed icon only shows for FORUM_POSTIgor Wiedler2010-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is cleaner, since feed.php only supports FORUM_POST. PHPBB3-9937
* | | | Merge branch 'ticket/rmcgirr83/9937' into develop-olympusIgor Wiedler2010-12-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/rmcgirr83/9937: [ticket/9937] The feed icon displays on External links...which we don't want
| * | | | [ticket/9937] The feed icon displays on External links...which we don't wantRMcGirr832010-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9937
* | | | | [ticket/9925] prosilver logo margin bug in IE 6-7-8Marc Alexander2010-12-191-0/+9
| |/ / / |/| | | | | | | | | | | PHPBB3-9925
* | | | Merge branch 'ticket/igorw/9924' into develop-olympusNils Adermann2010-12-132-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9924: [ticket/9924] Pass template instance into $template->display hook
| * | | | [ticket/9924] Pass template instance into $template->display hookIgor Wiedler2010-11-232-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-9924
* | | | | Merge branch 'ticket/adamreyher/9928' into develop-olympusNils Adermann2010-12-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9928: [ticket/9928] Do not link "login to your board" to the "send statistics" page.
| * | | | | [ticket/9928] Do not link "login to your board" to the "send statistics" page.Adam Reyher2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9928
* | | | | | Merge branch 'feature/ChrisTX/acm-wincache' into develop-olympusAndreas Fischer2010-12-131-0/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/ChrisTX/acm-wincache: [feature/acm-wincache] Adding caching module for WinCache's User Cache.
| * | | | | | [feature/acm-wincache] Adding caching module for WinCache's User Cache.ChrisTX2010-12-131-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9942
* | | | | | | [ticket/9851] "Search new posts" should require login.rxu2010-12-132-22/+35
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newposts search uses user_lastvisit, so it should require user to log in. PHPBB3-9851
* | | | | | [ticket/9939] Fix JavaScript error in admin recaptcha templateIgor Wiedler2010-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9939
* | | | | | Merge branch 'ticket/adamreyher/9575' into develop-olympusIgor Wiedler2010-12-055-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9575: [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/9575] Change 'administrate' to 'administer'