Skip to content

Commit 60c6000

Browse files
author
nobody
committed
This commit was manufactured by cvs2svn to create tag 'REL1_5_2'.
2 parents 9018faf + ddddc48 commit 60c6000

File tree

174 files changed

+13489
-12745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+13489
-12745
lines changed

‎RELEASE-NOTES‎

Lines changed: 378 additions & 108 deletions
Large diffs are not rendered by default.

‎UPGRADE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Basically, to upgrade a wiki you:
2020
== IMPORTANT: Upgrading to 1.5 ==
2121

2222
Major changes have been made to the schema from 1.4.x. The updater
23-
has not been fully tested for all conditions, and might well break.
23+
has not been fully tested for all conditions, and might well break
24+
under some combinations of versions.
2425

25-
DO NOT ATTEMPT TO UPGRADE A LIVE, PUBLIC SITE TO 1.5 AT THIS TIME.
2626
NEVER EVER ATTEMPT TO PERFORM AN UPGRADE WITHOUT BACKING UP FIRST!
2727

2828
On a large site, the schema update might take a long time. It might

‎config/index.php‎

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,14 @@ function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
220220
<?php
221221
}
222222

223+
if( ini_get( "mbstring.func_overload" ) ) {
224+
$fatal = true;
225+
?><li class='error'><strong>Fatal: <a href='http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload'>mbstring.func_overload</a> is active!</strong>
226+
This option causes errors and may corrupt data unpredictably;
227+
you cannot install or use MediaWiki unless this option is disabled.
228+
<?php
229+
}
230+
223231
if( $fatal ) {
224232
dieout( "</ul><p>Cannot install wiki.</p>" );
225233
}
@@ -373,6 +381,7 @@ function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
373381
$conf->DBpassword = importPost( "DBpassword" );
374382
$conf->DBpassword2 = importPost( "DBpassword2" );
375383
$conf->DBprefix = importPost( "DBprefix" );
384+
$conf->DBmysql5 = (importPost( "DBmysql5" ) == "true") ? "true" : "false";
376385
$conf->RootPW = importPost( "RootPW" );
377386
$conf->LanguageCode = importPost( "LanguageCode", "en" );
378387
$conf->SysopName = importPost( "SysopName", "WikiSysop" );
@@ -519,7 +528,7 @@ function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
519528
$errs["DBserver"] = "Connection failed";
520529
break;
521530
default:
522-
$errs["DBserver"] = "Couldn't connect to database";
531+
$errs["DBserver"] = "Couldn't connect to database ($err)";
523532
break;
524533
}
525534
if( !$ok ) continue;
@@ -543,6 +552,14 @@ function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
543552
<a href='http://dev.mysql.com/doc/mysql/en/old-client.html'
544553
>http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b>";
545554
}
555+
if( $wgDBmysql5 ) {
556+
if( $mysqlNewAuth ) {
557+
print "; enabling MySQL 4.1/5.0 charset mode";
558+
} else {
559+
print "; <b class='error'>MySQL 4.1/5.0 charset mode enabled,
560+
but older version detected; will likely fail.</b>";
561+
}
562+
}
546563
print "</li>\n";
547564

548565
@$sel = mysql_select_db( $wgDBname, $wgDatabase->mConn );
@@ -597,7 +614,13 @@ function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
597614
} else {
598615
# FIXME: Check for errors
599616
print "<li>Creating tables...";
600-
dbsource( "../maintenance/tables.sql", $wgDatabase );
617+
if( $wgDBmysql5 ) {
618+
print " using MySQL 5 table defs...";
619+
dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase );
620+
} else {
621+
print " using MySQL 3/4 table defs...";
622+
dbsource( "../maintenance/tables.sql", $wgDatabase );
623+
}
601624
dbsource( "../maintenance/interwiki.sql", $wgDatabase );
602625
print " done.</li>\n";
603626

@@ -824,7 +847,7 @@ function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
824847
use Turck shared memory if the wiki will be running on a single Apache server.
825848
</dl>
826849

827-
<h2>E-mail, e-mail notification and authentification setup</h2>
850+
<h2>E-mail, e-mail notification and authentication setup</h2>
828851

829852
<dl class="setup">
830853
<dd>
@@ -885,10 +908,8 @@ function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
885908
</ul>
886909
</dd>
887910
<dt>
888-
<p>
889-
E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or who changes his/her stored e-mail address
890-
gets a one-time temporary password mailed to that address. The user can use the original password as long as wanted, however, the stored e-mail address
891-
is only authenticated at the moment when the user logs in with the one-time temporary password.<p>
911+
<p>E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or changes his/her stored e-mail address
912+
gets a link with a token mailed to that address. The stored e-mail address is authenticated at the moment the user comes back to the wiki via the link.</p>
892913

893914
<p>The e-mail address stays authenticated as long as the user does not change it; the time of authentication is indicated
894915
on the user preference page.</p>
@@ -938,6 +959,20 @@ function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
938959

939960
<p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p>
940961
</dt>
962+
963+
<dd><label class="column">Database charset</label>
964+
<div>Select one:</div>
965+
<ul class="plain">
966+
<li><?php aField( $conf, "DBmysql5", "Backwards-compatible UTF-8", "radio", "false" ); ?></li>
967+
<li><?php aField( $conf, "DBmysql5", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "true" ); ?></li>
968+
</ul>
969+
</dd>
970+
<dt>
971+
<b>EXPERIMENTAL:</b> You can enable explicit Unicode charset support
972+
for MySQL 4.1 and 5.0 servers. This is not well tested and may
973+
cause things to break. <b>If upgrading an older installation, leave
974+
in backwards-compatible mode.</b>
975+
</dt>
941976

942977
<dd>
943978
<?php
@@ -1135,6 +1170,9 @@ function writeLocalSettings( $conf ) {
11351170
# If you're on MySQL 3.x, this next line must be FALSE:
11361171
\$wgDBmysql4 = {$conf->DBmysql4};
11371172
1173+
# Experimental charset support for MySQL 4.1/5.0.
1174+
\$wgDBmysql5 = {$conf->DBmysql5};
1175+
11381176
## Shared memory settings
11391177
\$wgMainCacheType = $cacheType;
11401178
\$wgMemCachedServers = $mcservers;

‎docs/README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ understand the most importants classes in MediaWiki.
66
API documentation is sometime generated and uploaded at:
77
http://wikipedia.sourceforge.net/doc/
88

9-
You can get a fresh version using 'make doc' or mwgendoc.php
9+
You can get a fresh version using 'make doc' or mwdocgen.php
1010
in the ../maintenance/ directory.
1111

1212

‎docs/deferred.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
DEFERRED.DOC
2+
deferred.txt
33

44
A few of the database updates required by various functions here
55
can be deferred until after the result page is displayed to the

‎docs/design.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Primary source files/objects:
2222
Can be queried for things like the user's settings, name, etc.
2323
Handles the details of getting and saving to the "user" table
2424
of the database, and dealing with sessions and cookies.
25-
More details in USER.DOC.
25+
More details in USER.TXT.
2626

2727
OutputPage
2828
Encapsulates the entire HTML page that will be sent in
@@ -64,7 +64,7 @@ Primary source files/objects:
6464
A global one is allocated in $wgLang.
6565

6666
LinkCache
67-
Keeps information on existence of articles. See LINKCACHE.DOC.
67+
Keeps information on existence of articles. See LINKCACHE.TXT.
6868

6969
Naming/coding conventions:
7070

‎docs/globals.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GLOBALS.DOC
1+
globals.txt
22

33
PHP loves globals. I hate them. This is not a great
44
combination, but I manage. I could get rid of most of

‎docs/hooks.txt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
HOOKS.DOC
1+
hooks.txt
22

33
This document describes how event hooks work in MediaWiki; how to add
44
hooks for an event; and how to run hooks for an event.
@@ -237,6 +237,9 @@ protocol came about after MediaWiki 1.4rc1.
237237
This is a list of known events and parameters; please add to it if
238238
you're going to add events to the MediaWiki code.
239239

240+
'AddNewAccount': after a user account is created
241+
null: This hook passes null as an argument
242+
240243
'ArticleDelete': before an article is deleted
241244
$article: the article (object) being deleted
242245
$user: the user (object) deleting the article
@@ -348,5 +351,11 @@ $article: article object watched
348351
'CategoryPageView': before viewing a categorypage in CategoryPage::view
349352
$catpage: CategoryPage instance
350353

354+
'SkinTemplateContentActions': after building the $content_action array right
355+
before returning it, see content_action.php in
356+
the extension module for a demonstration of how
357+
to use this hook.
358+
$content_actions: The array of content actions
359+
351360

352361
More hooks might not be available but undocumented.

‎docs/language.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LANGUAGE.DOC
1+
language.txt
22

33
The Language object handles all readable text produced by the
44
software. The most used function is getMessage(), usually

‎docs/linkcache.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LINKCACHE.DOC
1+
linkcache.txt
22

33
The LinkCache class maintains a list of article titles and
44
the information about whether or not the article exists in

0 commit comments

Comments
 (0)