mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
9,993 Commits 17 Branches 190 Tags
Commit Graph

9993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
5ec1c88795 [ticket/9930] Redirect failes with open_basedir enabled. 
Open_basedir does not allow file_exists() for "." and directories without a
trayling-slash. Therefor we must append it on the check.

PHPBB3-9930
 2010-11-25 23:29:12 +01:00
Igor Wiedler
053cf790a9 [ticket/9924] Pass template instance into $template->display hook 
PHPBB3-9924
 2010-11-23 16:09:09 +01:00
Igor Wiedler
f204ce6825 Merge branch 'ticket/rmcgirr83/9897' into develop-olympus 2010-11-21 23:48:17 +01:00
RMcGirr83
7e934c6362 [ticket/9897] A few language fixes 
PHPBB3-9897
 2010-11-21 23:46:09 +01:00
Igor Wiedler
217e77d16b [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs 
PHPBB3-9910
 2010-11-21 23:18:09 +01:00
Nils Adermann
d2778e67ea Merge branch 'prep-release-3.0.8' into develop-olympus 
* prep-release-3.0.8:
  [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog
  [ticket/9903] Script for detecting potentially malicious flash bbcodes
  [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.
  [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2010-11-20 17:55:56 +01:00
Nils Adermann
af4c2a3eb1 [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog release-3.0.8 2010-11-19 13:22:36 +01:00
Nils Adermann
2831a3a9a9 Merge branch 'ticket/9903' into prep-release-3.0.8 
* ticket/9903:
  [ticket/9903] Script for detecting potentially malicious flash bbcodes
  [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
 2010-11-19 11:33:14 +01:00
Igor Wiedler
49b639dd95 [ticket/9903] Script for detecting potentially malicious flash bbcodes 
PHPBB3-9903
 2010-11-19 11:31:00 +01:00
Nils Adermann
bce138ca14 Merge branch 'ticket/igorw/9904' into prep-release-3.0.8 
* ticket/igorw/9904:
  [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.
 2010-11-19 11:27:57 +01:00
Chris Sfanos
e043dc316a [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. 
PHPBB3-9904
 2010-11-19 11:27:16 +01:00
Andreas Fischer
fbca4e9c7b Merge branch 'prep-release-3.0.8' into develop-olympus 
* prep-release-3.0.8:
  [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
  [ticket/9509] Fix a typo and wrong period placement
 2010-11-18 14:04:57 +01:00
Andreas Fischer
d917b2d737 Merge branch 'ticket/igorw/9509' into prep-release-3.0.8 
* ticket/igorw/9509:
  [ticket/9509] Fix a typo and wrong period placement
 2010-11-18 14:01:38 +01:00
Andreas Fischer
bb9c8ca563 Merge branch 'ticket/rmcgirr83/9899' into prep-release-3.0.8 
* ticket/rmcgirr83/9899:
  [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
 2010-11-18 14:01:27 +01:00
RMcGirr83
6c45754a43 [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP. 
Change recaptcha theme from default to 'clean' in the ACP to better match
the administration control panel.

Follow up to d6aa25ede149a2d483b064f5ce96abcf49458ee3.

PHPBB3-9899
 2010-11-18 13:59:49 +01:00
Igor Wiedler
859149f5c3 [ticket/9509] Fix a typo and wrong period placement 
Thanks to Michael C. for spotting this.

PHPBB3-9509
 2010-11-18 13:55:39 +01:00
Ruslan Uzdenov
291a1fff1f [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode. 
Fix XSS in Flash-BBcode by validating that the supplied argument is a URL.

PHPBB3-9903
 2010-11-18 13:37:56 +01:00
Nils Adermann
b02cec86d4 [develop-olympus] Revert accidental revert of db update lang fix and version 
Really not my day, is it?
 2010-11-11 12:13:51 +01:00
Nils Adermann
396af3853f [develop-olympus] Remove accidentally added trailing newlines. 2010-11-11 12:07:45 +01:00
Nils Adermann
87aa611a8e [develop-olympus] Incrementing the version number to 3.0.9-dev. 2010-11-11 11:49:17 +01:00
Nils Adermann
7b4cdc94a8 [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes. release-3.0.8-RC1 2010-11-10 19:01:54 +01:00
Nils Adermann
cdb57aaa64 Merge branch 'ticket/nickvergessen/9140' into develop-olympus 
* ticket/nickvergessen/9140:
  [ticket/9140] Check current board version in incremental update packages
 2010-11-10 19:00:45 +01:00
Nils Adermann
cb94085323 Merge branch 'ticket/nickvergessen/9891' into develop-olympus 
* ticket/nickvergessen/9891:
  [ticket/9891] Updater drops language-selection after database-update
 2010-11-10 19:00:32 +01:00
Joas Schilling
4340e5a217 [ticket/9140] Check current board version in incremental update packages 
We need to use $this->current_version in this case instead of
$config['version']. Otherwise the message will be displayed after the database
got updated from database_update.php. Using PHPBB_VERSION from
includes/constants.php is not the right selection either, because than the
message is displayed after the files got updated and are checked one last time.

PHPBB3-9140
 2010-11-10 18:26:02 +01:00
Joas Schilling
9d55794e33 [ticket/9891] Updater drops language-selection after database-update 
PHPBB3-9891
 2010-11-10 17:56:05 +01:00
Nils Adermann
88602d138c [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1 2010-11-10 16:29:34 +01:00
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