diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-29 20:56:46 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-29 20:56:46 +0000 |
| commit | dc747b8d994b6f5d07182196ed9deed7959a7317 (patch) | |
| tree | 82796847148a27d822ea17199ee055244fc3028e /phpBB/develop | |
| parent | 202861eec9ca571cfae48002f2e0524986ae69bf (diff) | |
| download | forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.gz forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.bz2 forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.xz forums-dc747b8d994b6f5d07182196ed9deed7959a7317.zip | |
- * wildcard in a search query should cause \w+ in highlighting, not \w* [Bug #10031]
- display a warning that the search index is not converted from phpBB2 to phpBB3 [Bug #9761]
- forgot to add : to reg_name when deleting userinfo from the url regex constructor [Bug #9868]
- magic urls should work after ">"
- fixed sorting in mcp_reports/mcp_queue [Bug #9882]
- display a "Report has already been closed" message, if a post is accessed in mcp_reports which has a closed report (might occur if two moderators want to process it at the same time)
- convertor: old forum path should have the trailing slash removed
- subsilver2 will come bundled with phpBB3, but it will not be installed by default (if admins want to use it they can, but it's not a default option for users)
- prosilver was missing the topic-only mode in mcp_reports/mcp_queue
git-svn-id: file:///svn/phpbb/trunk@7428 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 12 | ||||
| -rw-r--r-- | phpBB/develop/regex.php | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index cf3e9e2e2c..f0cb989eb0 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -230,31 +230,31 @@ foreach ($supported_dbms as $dbms) { case 'mysql_40': case 'mysql_41': - $line = "#\n# MySQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n"; + $line = "#\n# \$I" . "d: $\n#\n\n"; break; case 'firebird': - $line = "#\n# Firebird Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n"; + $line = "#\n# \$I" . "d: $\n#\n\n"; $line .= custom_data('firebird') . "\n"; break; case 'sqlite': - $line = "#\n# SQLite Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n"; + $line = "#\n# \$I" . "d: $\n#\n\n"; $line .= "BEGIN TRANSACTION;\n\n"; break; case 'mssql': - $line = "/*\n MSSQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n"; + $line = "/*\n\n \$I" . "d: $\n\n*/\n\n"; $line .= "BEGIN TRANSACTION\nGO\n\n"; break; case 'oracle': - $line = "/*\n Oracle Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n"; + $line = "/*\n\n \$I" . "d: $\n\n*/\n\n"; $line .= custom_data('oracle') . "\n"; break; case 'postgres': - $line = "/*\n PostgreSQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n"; + $line = "/*\n\n \$I" . "d: $\n\n*/\n\n"; $line .= "BEGIN;\n\n"; $line .= custom_data('postgres') . "\n"; break; diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php index d59d9e6d68..4498204b4a 100644 --- a/phpBB/develop/regex.php +++ b/phpBB/develop/regex.php @@ -55,7 +55,7 @@ $sub_delims = '!$&\'()*+,;='; $pchar = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)"; // rfc: no "|" $scheme = '[a-z][a-z\d+\-.]*'; -$reg_name = "(?:[$unreserved$sub_delims|@]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" (included instead of userinfo +$reg_name = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" and no ":" (included instead of userinfo) //$userinfo = "(?:(?:[$unreserved$sub_delims:]+|$pct_encoded))*"; $ipv4_simple = '[0-9.]+'; $ipv6_simple = '\[[a-z0-9.]+:[a-z0-9.]+:[a-z0-9.:]+\]'; |