1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

9967 Commits

Author SHA1 Message Date
Nils Adermann
2ed9b3e1d5 Merge branch 'ticket/nickvergessen/9886' into develop-olympus
* ticket/nickvergessen/9886:
  [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
2010-11-10 16:16:16 +01:00
Nils Adermann
1b12884c7d Merge branch 'ticket/igorw/9884' into develop-olympus
* ticket/igorw/9884:
  [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20
2010-11-10 15:56:53 +01:00
Igor Wiedler
c9c19874d6 [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20
PHPBB3-9884
2010-11-10 15:50:53 +01:00
Joas Schilling
d722eeb64b [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
PHPBB3-9886
2010-11-09 07:56:37 +01:00
Andreas Fischer
05dce726d0 Merge branch 'ticket/nickvergessen/9888' into develop-olympus
* ticket/nickvergessen/9888:
  [ticket/9888] Update fails when Bing [Bot] was already added to the users table
2010-11-08 23:41:19 +01:00
Nils Adermann
1a637a3860 Merge branch 'ticket/bantu/9885' into develop-olympus
* ticket/bantu/9885:
  [ticket/9885] Fix extension group name updater. Loop through all languages.
2010-11-08 23:22:23 +01:00
Joas Schilling
b88f35caef [ticket/9888] Update fails when Bing [Bot] was already added to the users table
Added a check whether the user already exists before we try to add it.

PHPBB3-9888
2010-11-08 23:22:06 +01:00
Nils Adermann
794c0f6b68 [develop-olympus] Bumping version number for 3.0.8-RC1. 2010-11-08 23:21:27 +01:00
Andreas Fischer
f7e37dae86 [ticket/9885] Fix extension group name updater. Loop through all languages.
Fix a regression introduced by 58dc5a191c0203ea6d98c37df26b0830b3bf8203.

The problem is that $user->add_lang() includes language strings from the board
root folder instead of the update folder. Because the database updater is run
first, the root folder files have not been upgrade yet. Thus, the language
strings we're looking for cannot be found.

Since the language strings we are looking for have been moved from the
install.php language file to acp/attachments.php it should be possible to
always find them in either file. When there is an acp/attachments.php file in
the update package, it can also be used.

We now also loop through all the installed languages as well, because the board
could have been installed in a language other than the admin's current
language.

PHPBB3-9885
PHPBB3-7717
2010-11-08 14:19:53 +01:00
Andreas Fischer
e71911a8d2 Merge branch 'ticket/sa007/9847' into develop-olympus
* ticket/sa007/9847:
  [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
2010-11-08 12:48:19 +01:00
SA007
fd03ecad01 [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
The word "gauge" was misspelled as "guage".
The word "judgement" is preferred over "judgment" in british english.

PHPBB3-9847
2010-11-08 12:32:19 +01:00
Chris Smith
6f3b06e2b5 Merge branch 'ticket/sa007/9883' into develop-olympus
* ticket/sa007/9883:
  [ticket/9883] Change an American English spelling to British English.
2010-11-08 01:43:54 +00:00
SA007
babfd0075d [ticket/9883] Change an American English spelling to British English.
PHPBB3-9883
2010-11-08 01:29:46 +00:00
Andreas Fischer
0e731ca5dd Merge branch 'task/naderman/phing-build' into develop-olympus
* task/naderman/phing-build:
  [task/phing-build] Correct the path for update package patch files.
2010-11-08 00:17:47 +01:00
Nils Adermann
2847b2125e [task/phing-build] Correct the path for update package patch files.
PHPBB3-9849
2010-11-08 00:13:23 +01:00
Andreas Fischer
6c04e7ed80 Merge branch 'ticket/bantu/9880' into develop-olympus
* ticket/bantu/9880:
  [ticket/9880] Change "antibot" to "anti-spambot".
  [ticket/9880] Changing the term 'CAPTCHA' to something more obvious.
2010-11-07 14:57:07 +01:00
Andreas Fischer
81ca3d202e [ticket/9880] Change "antibot" to "anti-spambot".
PHPBB3-9880
2010-11-07 13:17:27 +01:00
Andreas Fischer
371e54e054 Merge branch 'ticket/paul999/9696' into develop-olympus
* ticket/paul999/9696:
  [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.
2010-11-07 13:12:16 +01:00
Paul Sohier
5cdf27edef [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.
PHPBB3-9696
2010-11-07 12:50:32 +01:00
Andreas Fischer
2e5217f773 Merge branch 'task/naderman/phing-build' into develop-olympus
* task/naderman/phing-build:
  [task/phing-build] Automatically trigger build_diff
  [task/phing-build] Added a build.xml configuration for phing.
2010-11-07 12:33:40 +01:00
Chris Smith
7b1d9fbbe2 [ticket/9880] Changing the term 'CAPTCHA' to something more obvious.
PHPBB3-9880
2010-11-07 05:28:29 +00:00
Nils Adermann
225482c06a Merge branch 'ticket/cs278/9752' into develop-olympus
* ticket/cs278/9752:
  [ticket/9752] Mark unused language variable as such.
  [ticket/9752] Change reference to 'confirmation code' to be more generic.
2010-11-07 03:27:44 +01:00
Chris Smith
dd1532a72c [ticket/9752] Mark unused language variable as such.
PHPBB3-9752
2010-11-07 02:16:56 +00:00
narqelion
576de284a7 [ticket/9752] Change reference to 'confirmation code' to be more generic.
Related to 71b35a924f7a5f517e8d07d975582c27813f5797

PHPBB3-9752
2010-11-07 02:15:33 +00:00
Nils Adermann
48e6126094 Merge remote branches 'github-bantu/ticket/9879' and 'github-cs278/ticket/9095' into develop-olympus
* github-bantu/ticket/9879:
  [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
  [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.

* github-cs278/ticket/9095:
  [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
2010-11-07 03:10:57 +01:00
narqelion
71b35a924f [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
With the addition of CAPTCHA plugins in 3.0.6 a number of language
strings need updating to account for non visual based CAPTCHAs.

PHPBB3-9095
2010-11-07 01:52:53 +00:00
Nils Adermann
e1aff2841b [task/phing-build] Automatically trigger build_diff
The build_diff script generates MOD format change descriptions for
language and style files. It is automatically triggered by phin with
the correct version numbers now so it does not need to be changed
anymore.

PHPBB3-9849
2010-11-07 02:14:49 +01:00
Andreas Fischer
5d9a9d6874 [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
PHPBB3-9879
2010-11-07 00:35:11 +01:00
narqelion
2299c40137 [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.
Fixed spelling, punctuation and grammar as well as removed registration
specific language from plugin as it can be/is used for form submissions other
than registration.

PHPBB3-9879
2010-11-07 00:13:01 +01:00
Nils Adermann
f7180f4430 Merge branch 'ticket/bantu/9075' into develop-olympus
* ticket/bantu/9075:
  [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.
2010-11-07 00:03:15 +01:00
Andreas Fischer
516282dfa9 Merge branch 'ticket/bantu/9835' into develop-olympus
* ticket/bantu/9835:
  [ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
2010-11-06 18:53:32 +01:00
Andreas Fischer
414d8a41e5 Merge branch 'ticket/bantu/9827' into develop-olympus
* ticket/bantu/9827:
  [ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
2010-11-06 18:51:52 +01:00
Andreas Fischer
46dbdfdef4 Merge branch 'ticket/igorw/9850' into develop-olympus
* ticket/igorw/9850:
  [ticket/9850] Display upgrade instructions for feature release in acp
2010-11-06 18:47:19 +01:00
Adam Reyher
3b7414fca8 [ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
The IE9 beta fixes the IE8 textarea width bug which required IE7 emulation in
phpBB's styles. Emulation should only occur when using IE8 now.

PHPBB3-9827
2010-11-05 17:07:18 +01:00
Andreas Fischer
e3b460a518 Merge branch 'task/naderman/mssql-db-tests' into develop-olympus
* task/naderman/mssql-db-tests:
  [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
  [task/mssql-db-tests] Split up database tests into SELECT and write operations
  [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
  [task/mssql-db-tests] sql_query_limit must return all results when total = 0
  [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections
  [task/mssql-db-tests] Refactored getConnection into multiple smaller parts.
  [task/mssql-db-tests] Allow test configuration with environment variables.
  [task/mssql-db-tests] No longer display an error when skipping db tests.
  [task/mssql-db-tests] Use a simple getter for test case helpers.
2010-11-03 11:32:13 +01:00
Igor Wiedler
857271ebbd [ticket/9850] Display upgrade instructions for feature release in acp
PHPBB3-9850
2010-11-02 23:53:14 +01:00
Andreas Fischer
ec3dac0595 [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.
When an administrator set a numbers field to default to 'not specified', a SQL
error was caused on the registration page because it was tried to insert an
empty string into an integer column.
Because the column already supports NULL values, empty strings are now
converted to NULL for custom profile fields of the type 'Numbers' before
insertion into the data table.

PHPBB3-9075
2010-10-30 12:42:23 +02:00
narqelion
a009614afb [ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
This makes subsilver2 consistent with prosilver.

PHPBB3-9835
2010-10-28 22:35:53 +02:00
Andreas Fischer
ac26bb458f [ticket/9764] Allow $config['mime_triggers'] to be an empty string.
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
2010-10-28 22:00:04 +02:00
Andreas Fischer
6ff403c9f8 Merge branch 'ticket/cs278/9061' into develop-olympus
* ticket/cs278/9061:
  [ticket/9061] Simplify conditional statements by reworking the logic.
  [ticket/9061] Fixed a race condition in queue locking.
2010-10-27 13:06:21 +02:00
Chris Smith
9819700247 [ticket/9061] Simplify conditional statements by reworking the logic.
PHPBB3-9061
2010-10-27 11:31:42 +01:00
Oleg Pudeyev
01ef46a510 [ticket/9061] Fixed a race condition in queue locking.
Changed queue locking to cover all queue file operations,
in particular the check for queue file existince and
inclusion of queue file must be done under one lock.

Also refactored queue locking and unlocking into separate
methods.

PHPBB3-9061
2010-10-27 11:31:27 +01:00
Igor Wiedler
832b09d60d Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and 'ticket/bantu/9853' into develop-olympus
* ticket/bantu/9101:
  [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.

* ticket/bantu/9595:
  [ticket/9595] List min/max characters indexed by search for mysql_fulltext.

* ticket/bantu/9853:
  [ticket/9853] Change recaptcha theme from default to 'clean'.
2010-10-25 22:08:37 +02:00
Andreas Fischer
52546e8d15 Merge branch 'ticket/naderman/9686' into develop-olympus
* ticket/naderman/9686:
  [ticket/9686] Fix mssqlnative database data export
2010-10-25 21:54:49 +02:00
Andreas Fischer
a5bc7c90f5 Merge branch 'ticket/rxu/9478' into develop-olympus
* ticket/rxu/9478:
  [ticket/9478] Validate maximum number of allowed recipients per PM value.
2010-10-25 21:52:50 +02:00
rxu
257e264af7 [ticket/9478] Validate maximum number of allowed recipients per PM value.
Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8).

PHPBB3-9478
2010-10-25 21:47:13 +02:00
Nils Adermann
76e8a9466e [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
PHPBB3-9868
2010-10-25 19:43:39 +02:00
Nils Adermann
fa8dca2400 [task/mssql-db-tests] Split up database tests into SELECT and write operations
SELECT is based on the user table fixture, write (INSERT/UPDATE/DELETE) is
tested using the config table fixture.

PHPBB3-9868
2010-10-25 19:43:39 +02:00
Nils Adermann
9b4da98653 [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
PHPBB3-9868
2010-10-25 19:43:39 +02:00
Nils Adermann
ee0993a8a6 [task/mssql-db-tests] sql_query_limit must return all results when total = 0
PHPBB3-9868
2010-10-25 19:43:39 +02:00