r88797 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r88796‎ \| r88797 \| r88798 >
Date:	15:39, 25 May 2011
Author:	mah
Status:	ok
Tags:
Comment:	Misc EOL w/s and spaces-instead-of-tabs fixes. One day I'll get around to nagging people for this stuff, but for now, I'll JFDI myself.
Modified paths:	/trunk/phase3/includes/ChangesList.php (modified) (history) /trunk/phase3/includes/DefaultSettings.php (modified) (history) /trunk/phase3/includes/HTMLForm.php (modified) (history) /trunk/phase3/includes/Linker.php (modified) (history) /trunk/phase3/includes/Revision.php (modified) (history) /trunk/phase3/includes/SpecialPage.php (modified) (history) /trunk/phase3/includes/cache/MessageCache.php (modified) (history) /trunk/phase3/includes/filerepo/File.php (modified) (history) /trunk/phase3/includes/parser/Parser.php (modified) (history) /trunk/phase3/includes/revisiondelete/RevisionDelete.php (modified) (history) /trunk/phase3/includes/revisiondelete/RevisionDeleteAbstracts.php (modified) (history) /trunk/phase3/languages/Language.php (modified) (history) /trunk/phase3/languages/messages/MessagesDe.php (modified) (history) /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/parser/Parser.php
—	—	@@ -783,7 +783,7 @@
784	784
785	785	# empty line, go to next line,
786	786	# but only append \n if outside of table
787		~~- if ( $line === '') {~~
	787	+ if ( $line === '') {
788	788	$output .= $outLine . "\n";
789	789	continue;
790	790	}
—	—	@@ -870,7 +870,7 @@
871	871	// a table caption, but only proceed if there isn't one already
872	872	if ( !isset ( $table['caption'] ) ) {
873	873	$line = substr ( $line , 2 );
874		-
	874	+
875	875	$c = $this->getCellAttr( $line , 'caption' );
876	876	$table['caption'] = array();
877	877	$table['caption']['content'] = $c[0];
—	—	@@ -944,7 +944,7 @@
945	945
946	946	/**
947	947	* Helper function for doTableStuff() separating the contents of cells from
948		~~- * attributes. Particularly useful as there's a possible bug and this action~~
	948	+ * attributes. Particularly useful as there's a possible bug and this action
949	949	* is repeated twice.
950	950	*
951	951	* @private
—	—	@@ -3511,7 +3511,7 @@
3512	3512	# Register the file as a dependency...
3513	3513	$this->mOutput->addImage( $title->getDBkey(), $time, $sha1 );
3514	3514	if ( $file && !$title->equals( $file->getTitle() ) ) {
3515		~~- # Update fetched file title~~
	3515	+ # Update fetched file title
3516	3516	$title = $file->getTitle();
3517	3517	}
3518	3518	return array( $file, $title );
—	—	@@ -4729,14 +4729,14 @@
4730	4730	# Bogus title. Ignore these so we don't bomb out later.
4731	4731	continue;
4732	4732	}
4733		-
	4733	+
4734	4734	$label = '';
4735	4735	$alt = '';
4736	4736	if ( isset( $matches[3] ) ) {
4737	4737	// look for an \|alt= definition while trying not to break existing
4738	4738	// captions with multiple pipes (\|) in it, until a more sensible grammar
4739	4739	// is defined for images in galleries
4740		-
	4740	+
4741	4741	$matches[3] = $this->recursiveTagParse( trim( $matches[3] ) );
4742	4742	$altmatches = StringUtils::explode('\|', $matches[3]);
4743	4743	$magicWordAlt = MagicWord::get( 'img_alt' );
Index: trunk/phase3/includes/Linker.php
—	—	@@ -879,7 +879,7 @@
880	880	$class .= " {$attribs['class']}";
881	881	}
882	882	$attribs['class'] = $class;
883		-
	883	+
884	884	if ( $escape ) {
885	885	$text = htmlspecialchars( $text );
886	886	}
—	—	@@ -1329,7 +1329,7 @@
1330	1330	$formatted = self::formatComment( $comment, $title, $local );
1331	1331	if ( $embraced ) {
1332	1332	$formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
1333		~~- }~~
	1333	+ }
1334	1334	return Html::rawElement( 'span', array( 'class' => 'comment' ), $formatted );
1335	1335	}
1336	1336	}
—	—	@@ -1534,12 +1534,12 @@
1535	1535	$query['bot'] = '1';
1536	1536	$query['hidediff'] = '1'; // bug 15999
1537	1537	}
1538		~~- return self::link(~~
1539		~~- $title,~~
	1538	+ return self::link(
	1539	+ $title,
1540	1540	wfMsgHtml( 'rollbacklink' ),
1541	1541	array( 'title' => wfMsg( 'tooltip-rollback' ) ),
1542		~~- $query,~~
1543		~~- array( 'known', 'noclasses' )~~
	1542	+ $query,
	1543	+ array( 'known', 'noclasses' )
1544	1544	);
1545	1545	}
1546	1546
—	—	@@ -1947,7 +1947,7 @@
1948	1948	}
1949	1949
1950	1950	class DummyLinker {
1951		-
	1951	+
1952	1952	/**
1953	1953	* Use PHP's magic __call handler to transform instance calls to a dummy instance
1954	1954	* into static calls to the new Linker for backwards compatibility.
Index: trunk/phase3/includes/filerepo/File.php
—	—	@@ -176,7 +176,7 @@
177	177	* @return Title
178	178	*/
179	179	public function getTitle() { return $this->title; }
180		-
	180	+
181	181	/**
182	182	* Return the title used to find this file
183	183	*/
—	—	@@ -288,8 +288,8 @@
289	289	}
290	290
291	291	/**
292		~~- * Return true if the file is vectorized~~
293		~~- */~~
	292	+ * Return true if the file is vectorized
	293	+ */
294	294	public function isVectorized() {
295	295	$handler = $this->getHandler();
296	296	if ( $handler ) {
—	—	@@ -318,7 +318,7 @@
319	319	$handler = $this->getHandler();
320	320	if ( !is_array( $metadata ) ) {
321	321	//just to make the return type consistant
322		~~- $metadata = unserialize( $metadata );~~
	322	+ $metadata = unserialize( $metadata );
323	323	}
324	324	if ( $handler ) {
325	325	return $handler->convertMetadataVersion( $metadata, $version );
—	—	@@ -517,7 +517,7 @@
518	518	function thumbName( $params ) {
519	519	return $this->generateThumbName( $this->getName(), $params );
520	520	}
521		-
	521	+
522	522	/**
523	523	* Generate a thumbnail file name from a name and specified parameters
524	524	*
—	—	@@ -612,8 +612,8 @@
613	613	if ( file_exists( $thumbPath )) {
614	614	$thumbTime = filemtime( $thumbPath );
615	615	if ( $thumbTime !== FALSE &&
616		~~- gmdate( 'YmdHis', $thumbTime ) >= $wgThumbnailEpoch ) {~~
617		-
	616	+ gmdate( 'YmdHis', $thumbTime ) >= $wgThumbnailEpoch ) {
	617	+
618	618	$thumb = $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params );
619	619	break;
620	620	}
—	—	@@ -629,9 +629,9 @@
630	630	$thumb = $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params );
631	631	}
632	632	}
633		-
634		~~- // Purge. Useful in the event of Core -> Squid connection failure or squid~~
635		~~- // purge collisions from elsewhere during failure. Don't keep triggering for~~
	633	+
	634	+ // Purge. Useful in the event of Core -> Squid connection failure or squid
	635	+ // purge collisions from elsewhere during failure. Don't keep triggering for
636	636	// "thumbs" which have the main image URL though (bug 13776)
637	637	if ( $wgUseSquid && ( !$thumb \|\| $thumb->isError() \|\| $thumb->getUrl() != $this->getURL()) ) {
638	638	SquidUpdate::purge( array( $thumbUrl ) );
—	—	@@ -953,11 +953,11 @@
954	954	function isDeleted( $field ) {
955	955	return false;
956	956	}
957		-
	957	+
958	958	/**
959	959	* Return the deletion bitfield
960	960	* STUB
961		~~- */~~
	961	+ */
962	962	function getVisibility() {
963	963	return 0;
964	964	}
—	—	@@ -1025,8 +1025,8 @@
1026	1026	}
1027	1027
1028	1028	/**
1029		~~- * Returns 'true' if this file is a type which supports multiple pages,~~
1030		~~- * e.g. DJVU or PDF. Note that this may be true even if the file in~~
	1029	+ * Returns 'true' if this file is a type which supports multiple pages,
	1030	+ * e.g. DJVU or PDF. Note that this may be true even if the file in
1031	1031	* question only has a single page.
1032	1032	*
1033	1033	* @return Bool
—	—	@@ -1096,7 +1096,7 @@
1097	1097	if ( $renderUrl ) {
1098	1098	if ( $this->repo->descriptionCacheExpiry > 0 ) {
1099	1099	wfDebug("Attempting to get the description from cache...");
1100		~~- $key = $this->repo->getLocalCacheKey( 'RemoteFileDescription', 'url', $wgLang->getCode(),~~
	1100	+ $key = $this->repo->getLocalCacheKey( 'RemoteFileDescription', 'url', $wgLang->getCode(),
1101	1101	$this->getName() );
1102	1102	$obj = $wgMemc->get($key);
1103	1103	if ($obj) {
—	—	@@ -1153,7 +1153,7 @@
1154	1154	}
1155	1155	$ext = $this->getExtension();
1156	1156	$dotExt = $ext === '' ? '' : ".$ext";
1157		~~- return $hash . $dotExt;~~
	1157	+ return $hash . $dotExt;
1158	1158	}
1159	1159
1160	1160	/**
—	—	@@ -1288,7 +1288,7 @@
1289	1289	function getRedirected() {
1290	1290	return $this->redirected;
1291	1291	}
1292		-
	1292	+
1293	1293	function getRedirectedTitle() {
1294	1294	if ( $this->redirected ) {
1295	1295	if ( !$this->redirectTitle ) {
Index: trunk/phase3/includes/HTMLForm.php
—	—	@@ -318,9 +318,9 @@
319	319	* Add header text, inside the form.
320	320	* @param $msg String complete text of message to display
321	321	*/
322		~~- function addHeaderText( $msg, $section = null ) {~~
	322	+ function addHeaderText( $msg, $section = null ) {
323	323	if ( is_null( $section ) ) {
324		~~- $this->mHeader .= $msg;~~
	324	+ $this->mHeader .= $msg;
325	325	} else {
326	326	if ( !isset( $this->mSectionHeaders[$section] ) ) {
327	327	$this->mSectionHeaders[$section] = '';
—	—	@@ -333,14 +333,14 @@
334	334	* Add footer text, inside the form.
335	335	* @param $msg String complete text of message to display
336	336	*/
337		~~- function addFooterText( $msg, $section = null ) {~~
	337	+ function addFooterText( $msg, $section = null ) {
338	338	if ( is_null( $section ) ) {
339		~~- $this->mFooter .= $msg;~~
	339	+ $this->mFooter .= $msg;
340	340	} else {
341	341	if ( !isset( $this->mSectionFooters[$section] ) ) {
342	342	$this->mSectionFooters[$section] = '';
343	343	}
344		~~- $this->mSectionFooters[$section] .= $msg;~~
	344	+ $this->mSectionFooters[$section] .= $msg;
345	345	}
346	346	}
347	347
—	—	@@ -693,11 +693,11 @@
694	694	$legend = $this->getLegend( $key );
695	695	if ( isset( $this->mSectionHeaders[$key] ) ) {
696	696	$section = $this->mSectionHeaders[$key] . $section;
697		~~- }~~
	697	+ }
698	698	if ( isset( $this->mSectionFooters[$key] ) ) {
699	699	$section .= $this->mSectionFooters[$key];
700	700	}
701		~~- $subsectionHtml .= Xml::fieldset( $legend, $section ) . "\n";~~
	701	+ $subsectionHtml .= Xml::fieldset( $legend, $section ) . "\n";
702	702	}
703	703	}
704	704
—	—	@@ -1886,8 +1886,8 @@
1887	1887	}
1888	1888	}
1889	1889	$msg->inContentLanguage();
1890		-
1891		-
	1890	+
	1891	+
1892	1892	return '<tr><td></td><td class="mw-input">'
1893	1893	. '<div class="mw-editTools">'
1894	1894	. $msg->parseAsBlock()
Index: trunk/phase3/includes/revisiondelete/RevisionDelete.php
—	—	@@ -78,7 +78,7 @@
79	79	public function getCurrent() {
80	80	if ( is_null( $this->currentRevId ) ) {
81	81	$dbw = wfGetDB( DB_MASTER );
82		~~- $this->currentRevId = $dbw->selectField(~~
	82	+ $this->currentRevId = $dbw->selectField(
83	83	'page', 'page_latest', $this->title->pageCond(), __METHOD__ );
84	84	}
85	85	return $this->currentRevId;
—	—	@@ -115,7 +115,7 @@
116	116	public function canView() {
117	117	return $this->revision->userCan( Revision::DELETED_RESTRICTED );
118	118	}
119		-
	119	+
120	120	public function canViewContent() {
121	121	return $this->revision->userCan( Revision::DELETED_TEXT );
122	122	}
—	—	@@ -129,8 +129,8 @@
130	130	// Update revision table
131	131	$dbw->update( 'revision',
132	132	array( 'rev_deleted' => $bits ),
133		~~- array(~~
134		~~- 'rev_id' => $this->revision->getId(),~~
	133	+ array(
	134	+ 'rev_id' => $this->revision->getId(),
135	135	'rev_page' => $this->revision->getPage(),
136	136	'rev_deleted' => $this->getBits()
137	137	),
—	—	@@ -142,7 +142,7 @@
143	143	}
144	144	// Update recentchanges table
145	145	$dbw->update( 'recentchanges',
146		~~- array(~~
	146	+ array(
147	147	'rc_deleted' => $bits,
148	148	'rc_patrolled' => 1
149	149	),
—	—	@@ -161,7 +161,7 @@
162	162	}
163	163
164	164	public function isHideCurrentOp( $newBits ) {
165		~~- return ( $newBits & Revision::DELETED_TEXT )~~
	165	+ return ( $newBits & Revision::DELETED_TEXT )
166	166	&& $this->list->getCurrent() == $this->getId();
167	167	}
168	168
—	—	@@ -177,7 +177,7 @@
178	178	}
179	179	return $this->special->skin->link(
180	180	$this->list->title,
181		~~- $date,~~
	181	+ $date,
182	182	array(),
183	183	array(
184	184	'oldid' => $this->revision->getId(),
—	—	@@ -194,9 +194,9 @@
195	195	if ( $this->isDeleted() && !$this->canViewContent() ) {
196	196	return wfMsgHtml('diff');
197	197	} else {
198		~~- return~~
199		~~- $this->special->skin->link(~~
200		~~- $this->list->title,~~
	198	+ return
	199	+ $this->special->skin->link(
	200	+ $this->list->title,
201	201	wfMsgHtml('diff'),
202	202	array(),
203	203	array(
—	—	@@ -281,7 +281,7 @@
282	282	# Convert DB timestamp to MW timestamp
283	283	return $this->revision->getTimestamp();
284	284	}
285		-
	285	+
286	286	public function setBits( $bits ) {
287	287	$dbw = wfGetDB( DB_MASTER );
288	288	$dbw->update( 'archive',
—	—	@@ -315,8 +315,8 @@
316	316	if ( $this->isDeleted() && !$this->canViewContent() ) {
317	317	return wfMsgHtml( 'diff' );
318	318	}
319		~~- $undelete = SpecialPage::getTitleFor( 'Undelete' );~~
320		~~- return $this->special->skin->link( $undelete, wfMsgHtml('diff'), array(),~~
	319	+ $undelete = SpecialPage::getTitleFor( 'Undelete' );
	320	+ return $this->special->skin->link( $undelete, wfMsgHtml('diff'), array(),
321	321	array(
322	322	'target' => $this->list->title->getPrefixedText(),
323	323	'diff' => 'prev',
—	—	@@ -452,7 +452,7 @@
453	453	public function canView() {
454	454	return $this->file->userCan( File::DELETED_RESTRICTED );
455	455	}
456		-
	456	+
457	457	public function canViewContent() {
458	458	return $this->file->userCan( File::DELETED_FILE );
459	459	}
—	—	@@ -484,12 +484,12 @@
485	485	$dstRel = $this->file->repo->getDeletedHashPath( $key ) . $key;
486	486	$this->list->deleteBatch[] = array( $this->file->getRel(), $dstRel );
487	487	}
488		-
	488	+
489	489	# Do the database operations
490	490	$dbw = wfGetDB( DB_MASTER );
491	491	$dbw->update( 'oldimage',
492	492	array( 'oi_deleted' => $bits ),
493		~~- array(~~
	493	+ array(
494	494	'oi_name' => $this->row->oi_name,
495	495	'oi_timestamp' => $this->row->oi_timestamp,
496	496	'oi_deleted' => $this->getBits()
—	—	@@ -504,20 +504,20 @@
505	505	}
506	506
507	507	/**
508		~~- * Get the link to the file.~~
	508	+ * Get the link to the file.
509	509	* Overridden by RevDel_ArchivedFileItem.
510	510	*/
511	511	protected function getLink() {
512	512	global $wgLang, $wgUser;
513		~~- $date = $wgLang->timeanddate( $this->file->getTimestamp(), true );~~
	513	+ $date = $wgLang->timeanddate( $this->file->getTimestamp(), true );
514	514	if ( $this->isDeleted() ) {
515	515	# Hidden files...
516	516	if ( !$this->canViewContent() ) {
517	517	$link = $date;
518	518	} else {
519		~~- $link = $this->special->skin->link(~~
520		~~- $this->special->getTitle(),~~
521		~~- $date, array(),~~
	519	+ $link = $this->special->skin->link(
	520	+ $this->special->getTitle(),
	521	+ $date, array(),
522	522	array(
523	523	'target' => $this->list->title->getPrefixedText(),
524	524	'file' => $this->file->getArchiveName(),
—	—	@@ -568,14 +568,14 @@
569	569
570	570	public function getHTML() {
571	571	global $wgLang;
572		~~- $data =~~
	572	+ $data =
573	573	wfMsg(
574		~~- 'widthheight',~~
	574	+ 'widthheight',
575	575	$wgLang->formatNum( $this->file->getWidth() ),
576		~~- $wgLang->formatNum( $this->file->getHeight() )~~
	576	+ $wgLang->formatNum( $this->file->getHeight() )
577	577	) .
578		~~- ' (' .~~
579		~~- wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $this->file->getSize() ) ) .~~
	578	+ ' (' .
	579	+ wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $this->file->getSize() ) ) .
580	580	')';
581	581
582	582	return '<li>' . $this->getLink() . ' ' . $this->getUserTools() . ' ' .
—	—	@@ -715,7 +715,7 @@
716	716	public function canView() {
717	717	return LogEventsList::userCan( $this->row, Revision::DELETED_RESTRICTED );
718	718	}
719		-
	719	+
720	720	public function canViewContent() {
721	721	return true; // none
722	722	}
—	—	@@ -727,9 +727,9 @@
728	728	public function setBits( $bits ) {
729	729	$dbw = wfGetDB( DB_MASTER );
730	730	$dbw->update( 'recentchanges',
731		~~- array(~~
732		~~- 'rc_deleted' => $bits,~~
733		~~- 'rc_patrolled' => 1~~
	731	+ array(
	732	+ 'rc_deleted' => $bits,
	733	+ 'rc_patrolled' => 1
734	734	),
735	735	array(
736	736	'rc_logid' => $this->row->log_id,
Index: trunk/phase3/includes/revisiondelete/RevisionDeleteAbstracts.php
—	—	@@ -66,7 +66,7 @@
67	67	return $this->authorNameField;
68	68	}
69	69	/**
70		~~- * Set the visibility for the revisions in this list. Logging and~~
	70	+ * Set the visibility for the revisions in this list. Logging and
71	71	* transactions are done here.
72	72	*
73	73	* @param $params Associative array of parameters. Members are:
—	—	@@ -127,7 +127,7 @@
128	128	$status->warning( 'revdelete-only-restricted', $item->formatDate(), $item->formatTime() );
129	129	$status->failCount++;
130	130	continue;
131		~~- }~~
	131	+ }
132	132
133	133	// Update the revision
134	134	$ok = $item->setBits( $newBits );
—	—	@@ -158,7 +158,7 @@
159	159	return $status;
160	160	}
161	161
162		~~- // Save success count~~
	162	+ // Save success count
163	163	$successCount = $status->successCount;
164	164
165	165	// Move files, if there are any
—	—	@@ -171,9 +171,9 @@
172	172
173	173	// Log it
174	174	$this->updateLog( array(
175		~~- 'title' => $this->title,~~
176		~~- 'count' => $successCount,~~
177		~~- 'newBits' => $newBits,~~
	175	+ 'title' => $this->title,
	176	+ 'count' => $successCount,
	177	+ 'newBits' => $newBits,
178	178	'oldBits' => $oldBits,
179	179	'comment' => $comment,
180	180	'ids' => $idsForLog,
—	—	@@ -200,7 +200,7 @@
201	201	* Record a log entry on the action
202	202	* @param $params Associative array of parameters:
203	203	* newBits: The new value of the *_deleted bitfield
204		~~- * oldBits: The old value of the *_deleted bitfield.~~
	204	+ * oldBits: The old value of the *_deleted bitfield.
205	205	* title: The target title
206	206	* ids: The ID list
207	207	* comment: The log comment
—	—	@@ -265,7 +265,7 @@
266	266	}
267	267
268	268	/**
269		~~- * Start iteration. This must be called before current() or next().~~
	269	+ * Start iteration. This must be called before current() or next().
270	270	* @return First list item
271	271	*/
272	272	public function reset() {
—	—	@@ -293,7 +293,7 @@
294	294	$this->initCurrent();
295	295	return $this->current;
296	296	}
297		-
	297	+
298	298	/**
299	299	* Get the number of items in the list.
300	300	*/
—	—	@@ -312,7 +312,7 @@
313	313	public function clearFileOps() {
314	314	}
315	315
316		- /**
	316	+ /**
317	317	* A hook for setVisibility(): do batch updates pre-commit.
318	318	* STUB
319	319	* @return Status
—	—	@@ -322,9 +322,9 @@
323	323	}
324	324
325	325	/**
326		~~- * A hook for setVisibility(): do any necessary updates post-commit.~~
	326	+ * A hook for setVisibility(): do any necessary updates post-commit.
327	327	* STUB
328		~~- * @return Status~~
	328	+ * @return Status
329	329	*/
330	330	public function doPostCommitUpdates() {
331	331	return Status::newGood();
—	—	@@ -361,7 +361,7 @@
362	362	/** The DB result row */
363	363	var $row;
364	364
365		- /**
	365	+ /**
366	366	* @param $list RevDel_List
367	367	* @param $row DB result row
368	368	*/
—	—	@@ -402,10 +402,10 @@
403	403	$field = $this->list->getTimestampField();
404	404	return wfTimestamp( TS_MW, $this->row->$field );
405	405	}
406		-
	406	+
407	407	/**
408	408	* Get the author user ID
409		~~- */~~
	409	+ */
410	410	public function getAuthorId() {
411	411	$field = $this->list->getAuthorIdField();
412	412	return intval( $this->row->$field );
—	—	@@ -413,13 +413,13 @@
414	414
415	415	/**
416	416	* Get the author user name
417		~~- */~~
	417	+ */
418	418	public function getAuthorName() {
419	419	$field = $this->list->getAuthorNameField();
420	420	return strval( $this->row->$field );
421	421	}
422	422
423		- /**
	423	+ /**
424	424	* Returns true if the item is "current", and the operation to set the given
425	425	* bits can't be executed for that reason
426	426	* STUB
—	—	@@ -432,7 +432,7 @@
433	433	* Returns true if the current user can view the item
434	434	*/
435	435	abstract public function canView();
436		-
	436	+
437	437	/**
438	438	* Returns true if the current user can view the item text/file
439	439	*/
—	—	@@ -453,8 +453,8 @@
454	454	* Set the visibility of the item. This should do any necessary DB queries.
455	455	*
456	456	* The DB update query should have a condition which forces it to only update
457		~~- * if the value in the DB matches the value fetched earlier with the SELECT.~~
458		~~- * If the update fails because it did not match, the function should return~~
	457	+ * if the value in the DB matches the value fetched earlier with the SELECT.
	458	+ * If the update fails because it did not match, the function should return
459	459	* false. This prevents concurrency problems.
460	460	*
461	461	* @return boolean success
Index: trunk/phase3/includes/Revision.php
—	—	@@ -25,7 +25,7 @@
26	26	public static function newFromId( $id ) {
27	27	return Revision::newFromConds(
28	28	array( 'page_id=rev_page',
29		~~- 'rev_id' => intval( $id ) ) );~~
	29	+ 'rev_id' => intval( $id ) ) );
30	30	}
31	31
32	32	/**
—	—	@@ -38,8 +38,8 @@
39	39	* @return Revision or null
40	40	*/
41	41	public static function newFromTitle( $title, $id = 0 ) {
42		~~- $conds = array(~~
43		~~- 'page_namespace' => $title->getNamespace(),~~
	42	+ $conds = array(
	43	+ 'page_namespace' => $title->getNamespace(),
44	44	'page_title' => $title->getDBkey()
45	45	);
46	46	if ( $id ) {
—	—	@@ -100,7 +100,7 @@
101	101	public static function loadFromId( $db, $id ) {
102	102	return Revision::loadFromConds( $db,
103	103	array( 'page_id=rev_page',
104		~~- 'rev_id' => intval( $id ) ) );~~
	104	+ 'rev_id' => intval( $id ) ) );
105	105	}
106	106
107	107	/**
—	—	@@ -142,9 +142,9 @@
143	143	return Revision::loadFromConds(
144	144	$db,
145	145	array( "rev_id=$matchId",
146		~~- 'page_id=rev_page',~~
147		~~- 'page_namespace' => $title->getNamespace(),~~
148		~~- 'page_title' => $title->getDBkey() ) );~~
	146	+ 'page_id=rev_page',
	147	+ 'page_namespace' => $title->getNamespace(),
	148	+ 'page_title' => $title->getDBkey() ) );
149	149	}
150	150
151	151	/**
—	—	@@ -161,9 +161,9 @@
162	162	return Revision::loadFromConds(
163	163	$db,
164	164	array( 'rev_timestamp' => $db->timestamp( $timestamp ),
165		~~- 'page_id=rev_page',~~
166		~~- 'page_namespace' => $title->getNamespace(),~~
167		~~- 'page_title' => $title->getDBkey() ) );~~
	165	+ 'page_id=rev_page',
	166	+ 'page_namespace' => $title->getNamespace(),
	167	+ 'page_title' => $title->getDBkey() ) );
168	168	}
169	169
170	170	/**
—	—	@@ -216,9 +216,9 @@
217	217	return Revision::fetchFromConds(
218	218	wfGetDB( DB_SLAVE ),
219	219	array( 'rev_id=page_latest',
220		~~- 'page_namespace' => $title->getNamespace(),~~
221		~~- 'page_title' => $title->getDBkey(),~~
222		~~- 'page_id=rev_page' ) );~~
	220	+ 'page_namespace' => $title->getNamespace(),
	221	+ 'page_title' => $title->getDBkey(),
	222	+ 'page_id=rev_page' ) );
223	223	}
224	224
225	225	/**
—	—	@@ -264,9 +264,9 @@
265	265	'rev_parent_id'
266	266	);
267	267	}
268		-
	268	+
269	269	/**
270		~~- * Return the list of text fields that should be selected to read the~~
	270	+ * Return the list of text fields that should be selected to read the
271	271	* revision text
272	272	*/
273	273	static function selectTextFields() {
—	—	@@ -412,11 +412,11 @@
413	413	array( 'page', 'revision' ),
414	414	array( 'page_namespace', 'page_title' ),
415	415	array( 'page_id=rev_page',
416		~~- 'rev_id' => $this->mId ),~~
	416	+ 'rev_id' => $this->mId ),
417	417	'Revision::getTitle' );
418	418	if( $row ) {
419	419	$this->mTitle = Title::makeTitle( $row->page_namespace,
420		~~- $row->page_title );~~
	420	+ $row->page_title );
421	421	}
422	422	return $this->mTitle;
423	423	}
—	—	@@ -441,7 +441,7 @@
442	442
443	443	/**
444	444	* Fetch revision's user id if it's available to the specified audience.
445		~~- * If the specified audience does not have access to it, zero will be~~
	445	+ * If the specified audience does not have access to it, zero will be
446	446	* returned.
447	447	*
448	448	* @param $audience Integer: one of:
—	—	@@ -473,7 +473,7 @@
474	474
475	475	/**
476	476	* Fetch revision's username if it's available to the specified audience.
477		~~- * If the specified audience does not have access to the username, an~~
	477	+ * If the specified audience does not have access to the username, an
478	478	* empty string will be returned.
479	479	*
480	480	* @param $audience Integer: one of:
—	—	@@ -504,7 +504,7 @@
505	505
506	506	/**
507	507	* Fetch revision comment if it's available to the specified audience.
508		~~- * If the specified audience does not have access to the comment, an~~
	508	+ * If the specified audience does not have access to the comment, an
509	509	* empty string will be returned.
510	510	*
511	511	* @param $audience Integer: one of:
—	—	@@ -539,7 +539,7 @@
540	540	public function isMinor() {
541	541	return (bool)$this->mMinorEdit;
542	542	}
543		-
	543	+
544	544	/**
545	545	* @return Integer rcid of the unpatrolled row, zero if there isn't one
546	546	*/
—	—	@@ -579,7 +579,7 @@
580	580
581	581	/**
582	582	* Fetch revision text if it's available to the specified audience.
583		~~- * If the specified audience does not have the ability to view this~~
	583	+ * If the specified audience does not have the ability to view this
584	584	* revision, an empty string will be returned.
585	585	*
586	586	* @param $audience Integer: one of:
—	—	@@ -753,8 +753,8 @@
754	754	}
755	755
756	756	global $wgLegacyEncoding;
757		~~- if( $text !== false && $wgLegacyEncoding~~
758		~~- && !in_array( 'utf-8', $flags ) && !in_array( 'utf8', $flags ) )~~
	757	+ if( $text !== false && $wgLegacyEncoding
	758	+ && !in_array( 'utf-8', $flags ) && !in_array( 'utf8', $flags ) )
759	759	{
760	760	# Old revisions kept around in a legacy encoding?
761	761	# Upconvert on demand.
Index: trunk/phase3/includes/ChangesList.php
—	—	@@ -41,7 +41,7 @@
42	42	protected $watchlist = false;
43	43
44	44	protected $message;
45		-
	45	+
46	46	/**
47	47	* Changeslist contructor
48	48	* @param $skin Skin
—	—	@@ -70,7 +70,7 @@
71	71	return $list;
72	72	}
73	73	}
74		-
	74	+
75	75	/**
76	76	* Sets the list to use a <li class="watchlist-(namespace)-(page)"> tag
77	77	* @param $value Boolean
—	—	@@ -120,11 +120,11 @@
121	121	public static function flag( $flag ) {
122	122	static $messages = null;
123	123	if ( is_null( $messages ) ) {
124		~~- $messages = array(~~
	124	+ $messages = array(
125	125	'newpage' => array( 'newpageletter', 'recentchanges-label-newpage' ),
126	126	'minoredit' => array( 'minoreditletter', 'recentchanges-label-minor' ),
127	127	'botedit' => array( 'boteditletter', 'recentchanges-label-bot' ),
128		~~- 'unpatrolled' => array( 'unpatrolledletter', 'recentchanges-label-unpatrolled' ),~~
	128	+ 'unpatrolled' => array( 'unpatrolledletter', 'recentchanges-label-unpatrolled' ),
129	129	);
130	130	foreach( $messages as &$value ) {
131	131	$value[0] = wfMsgExt( $value[0], 'escapenoentities' );
—	—	@@ -158,7 +158,7 @@
159	159	$this->rclistOpen = false;
160	160	return '';
161	161	}
162		-
	162	+
163	163	/**
164	164	* Show formatted char difference
165	165	* @param $old Integer: bytes
—	—	@@ -174,29 +174,29 @@
175	175	if ( !isset($fastCharDiff[$code]) ) {
176	176	$fastCharDiff[$code] = $wgMiserMode \|\| wfMsgNoTrans( 'rc-change-size' ) === '$1';
177	177	}
178		-
	178	+
179	179	$formatedSize = $wgLang->formatNum($szdiff);
180	180
181	181	if ( !$fastCharDiff[$code] ) {
182	182	$formatedSize = wfMsgExt( 'rc-change-size', array( 'parsemag', 'escape' ), $formatedSize );
183	183	}
184		-
	184	+
185	185	if( abs( $szdiff ) > abs( $wgRCChangedSizeThreshold ) ) {
186	186	$tag = 'strong';
187	187	} else {
188		~~- $tag = 'span';~~
	188	+ $tag = 'span';
189	189	}
190	190	if( $szdiff === 0 ) {
191	191	return "<$tag class='mw-plusminus-null'>($formatedSize)</$tag>";
192	192	} elseif( $szdiff > 0 ) {
193	193	return "<$tag class='mw-plusminus-pos'>(+$formatedSize)</$tag>";
194		~~- } else {~~
	194	+ } else {
195	195	return "<$tag class='mw-plusminus-neg'>($formatedSize)</$tag>";
196	196	}
197	197	}
198	198
199	199	/**
200		~~- * Returns text for the end of RC~~
	200	+ * Returns text for the end of RC
201	201	* @return String
202	202	*/
203	203	public function endRecentChangesList() {
—	—	@@ -370,7 +370,7 @@
371	371	*/
372	372	public function insertTimestamp( &$s, $rc ) {
373	373	global $wgLang;
374		~~- $s .= $this->message['semicolon-separator'] .~~
	374	+ $s .= $this->message['semicolon-separator'] .
375	375	$wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . ';
376	376	}
377	377
—	—	@@ -474,7 +474,7 @@
475	475	return '<span class="mw-rc-unwatched">' . $link . '</span>';
476	476	}
477	477	}
478		-
	478	+
479	479	/** Inserts a rollback link
480	480	*
481	481	* @param $s
—	—	@@ -509,7 +509,7 @@
510	510	public function insertTags( &$s, &$rc, &$classes ) {
511	511	if ( empty($rc->mAttribs['ts_tags']) )
512	512	return;
513		-
	513	+
514	514	list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( $rc->mAttribs['ts_tags'], 'changeslist' );
515	515	$classes = array_merge( $classes, $newClasses );
516	516	$s .= ' ' . $tagSummary;
—	—	@@ -568,11 +568,11 @@
569	569	} else {
570	570	$this->insertDiffHist( $s, $rc, $unpatrolled );
571	571	# M, N, b and ! (minor, new, bot and unpatrolled)
572		~~- $s .= $this->recentChangesFlags(~~
	572	+ $s .= $this->recentChangesFlags(
573	573	array(
574	574	'newpage' => $rc->mAttribs['rc_new'],
575	575	'minor' => $rc->mAttribs['rc_minor'],
576		~~- 'unpatrolled' => $unpatrolled,~~
	576	+ 'unpatrolled' => $unpatrolled,
577	577	'bot' => $rc->mAttribs['rc_bot']
578	578	),
579	579	''
—	—	@@ -600,17 +600,17 @@
601	601	$this->insertRollback( $s, $rc );
602	602	# For subclasses
603	603	$this->insertExtra( $s, $rc, $classes );
604		-
	604	+
605	605	# How many users watch this page
606	606	if( $rc->numberofWatchingusers > 0 ) {
607		~~- $s .= ' ' . wfMsgExt( 'number_of_watching_users_RCview',~~
	607	+ $s .= ' ' . wfMsgExt( 'number_of_watching_users_RCview',
608	608	array( 'parsemag', 'escape' ), $wgLang->formatNum( $rc->numberofWatchingusers ) );
609	609	}
610		-
	610	+
611	611	if( $this->watchlist ) {
612	612	$classes[] = Sanitizer::escapeClass( 'watchlist-'.$rc->mAttribs['rc_namespace'].'-'.$rc->mAttribs['rc_title'] );
613	613	}
614		-
	614	+
615	615	wfRunHooks( 'OldChangesListRecentChangesLine', array(&$this, &$s, $rc) );
616	616
617	617	wfProfileOut( __METHOD__ );
—	—	@@ -647,7 +647,7 @@
648	648	*/
649	649	public function recentChangesLine( &$baseRC, $watched = false ) {
650	650	global $wgLang, $wgUser;
651		-
	651	+
652	652	wfProfileIn( __METHOD__ );
653	653
654	654	# Create a specialised object
—	—	@@ -668,7 +668,7 @@
669	669
670	670	# Should patrol-related stuff be shown?
671	671	if( $wgUser->useRCPatrol() ) {
672		~~- $rc->unpatrolled = !$rc->mAttribs['rc_patrolled'];~~
	672	+ $rc->unpatrolled = !$rc->mAttribs['rc_patrolled'];
673	673	} else {
674	674	$rc->unpatrolled = false;
675	675	}
—	—	@@ -691,7 +691,7 @@
692	692	} else if( $type == RC_LOG ) {
693	693	if( $logType ) {
694	694	$logtitle = SpecialPage::getTitleFor( 'Log', $logType );
695		~~- $clink = '(' . $this->skin->linkKnown( $logtitle,~~
	695	+ $clink = '(' . $this->skin->linkKnown( $logtitle,
696	696	LogPage::logName( $logType ) ) . ')';
697	697	} else {
698	698	$clink = $this->skin->link( $rc->getTitle() );
—	—	@@ -874,7 +874,7 @@
875	875	array_push( $users, $text );
876	876	}
877	877
878		~~- $users = ' <span class="changedby">[' .~~
	878	+ $users = ' <span class="changedby">[' .
879	879	implode( $this->message['semicolon-separator'], $users ) . ']</span>';
880	880
881	881	# Title for <a> tags
—	—	@@ -893,7 +893,7 @@
894	894	$r .= '<td class="mw-enhanced-rc">' . $this->recentChangesFlags( array(
895	895	'newpage' => $isnew,
896	896	'minor' => false,
897		~~- 'unpatrolled' => $unpatrolled,~~
	897	+ 'unpatrolled' => $unpatrolled,
898	898	'bot' => $bot ,
899	899	) );
900	900
—	—	@@ -930,7 +930,7 @@
931	931	$params = $queryParams;
932	932	$params['diff'] = $currentRevision;
933	933	$params['oldid'] = $oldid;
934		-
	934	+
935	935	$r .= $this->skin->link(
936	936	$block[0]->getTitle(),
937	937	$nchanges[$n],
—	—	@@ -997,7 +997,7 @@
998	998	$r .= $this->recentChangesFlags( array(
999	999	'newpage' => $rcObj->mAttribs['rc_new'],
1000	1000	'minor' => $rcObj->mAttribs['rc_minor'],
1001		~~- 'unpatrolled' => $rcObj->unpatrolled,~~
	1001	+ 'unpatrolled' => $rcObj->unpatrolled,
1002	1002	'bot' => $rcObj->mAttribs['rc_bot'],
1003	1003	) );
1004	1004	$r .= ' </td><td class="mw-enhanced-rc-nested"><span class="mw-enhanced-rc-time">';
—	—	@@ -1142,7 +1142,7 @@
1143	1143	$r .= $this->recentChangesFlags( array(
1144	1144	'newpage' => $type == RC_NEW,
1145	1145	'mino' => $rcObj->mAttribs['rc_minor'],
1146		~~- 'unpatrolled' => $rcObj->unpatrolled,~~
	1146	+ 'unpatrolled' => $rcObj->unpatrolled,
1147	1147	'bot' => $rcObj->mAttribs['rc_bot'],
1148	1148	) );
1149	1149	}
—	—	@@ -1232,7 +1232,7 @@
1233	1233	}
1234	1234
1235	1235	/**
1236		~~- * Returns text for the end of RC~~
	1236	+ * Returns text for the end of RC
1237	1237	* If enhanced RC is in use, returns pretty much all the text
1238	1238	*/
1239	1239	public function endRecentChangesList() {
Index: trunk/phase3/includes/cache/MessageCache.php
—	—	@@ -197,7 +197,7 @@
198	198
199	199	$filename = "$wgCacheDirectory/messages-" . wfWikiID() . "-$code";
200	200	$tempFilename = $filename . '.tmp';
201		~~- wfMkdirParents( $wgCacheDirectory ); // might fail~~
	201	+ wfMkdirParents( $wgCacheDirectory ); // might fail
202	202
203	203	wfSuppressWarnings();
204	204	$file = fopen( $tempFilename, 'w' );
Index: trunk/phase3/includes/DefaultSettings.php
—	—	@@ -58,7 +58,7 @@
59	59	# additionially, for requests made directly to an IPv6 address we have
60	60	# to make sure the server enclose it in either [] or nothing at all
61	61	&& (strpos($_SERVER['SERVER_NAME'], '[')
62		~~- xor strpos( $_SERVER['SERVER_NAME'], ']'))~~
	62	+ xor strpos( $_SERVER['SERVER_NAME'], ']'))
63	63	) {
64	64	$serverName = $_SERVER['SERVER_NAME'];
65	65	} elseif( isset( $_SERVER['HOSTNAME'] ) ) {
—	—	@@ -552,8 +552,8 @@
553	553
554	554	/**
555	555	* Allow Java archive uploads.
556		~~- * This is not recommended for public wikis since a maliciously-constructed~~
557		~~- * applet running on the same domain as the wiki can steal the user's cookies.~~
	556	+ * This is not recommended for public wikis since a maliciously-constructed
	557	+ * applet running on the same domain as the wiki can steal the user's cookies.
558	558	*/
559	559	$wgAllowJavaUploads = false;
560	560
—	—	@@ -676,7 +676,7 @@
677	677	$wgSVGMaxSize = 2048;
678	678	/** Don't read SVG metadata beyond this point.
679	679	* Default is 1024256 bytes /
680		~~-$wgSVGMetadataCutoff = 262144;~~
	680	+$wgSVGMetadataCutoff = 262144;
681	681
682	682	/**
683	683	* MediaWiki will reject HTMLesque tags in uploaded files due to idiotic browsers which can't
—	—	@@ -1483,7 +1483,7 @@
1484	1484	* - CACHE_DBA: Use PHP's DBA extension to store in a DBM-style
1485	1485	* database. This is slow, and is not recommended for
1486	1486	* anything other than debugging.
1487		~~- * - (other): A string may be used which identifies a cache~~
	1487	+ * - (other): A string may be used which identifies a cache
1488	1488	* configuration in $wgObjectCaches.
1489	1489	*
1490	1490	* @see $wgMessageCacheType, $wgParserCacheType
—	—	@@ -1509,13 +1509,13 @@
1510	1510	/**
1511	1511	* Advanced object cache configuration.
1512	1512	*
1513		~~- * Use this to define the class names and constructor parameters which are used~~
1514		~~- * for the various cache types. Custom cache types may be defined here and~~
	1513	+ * Use this to define the class names and constructor parameters which are used
	1514	+ * for the various cache types. Custom cache types may be defined here and
1515	1515	* referenced from $wgMainCacheType, $wgMessageCacheType or $wgParserCacheType.
1516	1516	*
1517		~~- * The format is an associative array where the key is a cache identifier, and~~
	1517	+ * The format is an associative array where the key is a cache identifier, and
1518	1518	* the value is an associative array of parameters. The "class" parameter is the
1519		~~- * class name which will be used. Alternatively, a "factory" parameter may be~~
	1519	+ * class name which will be used. Alternatively, a "factory" parameter may be
1520	1520	* given, giving a callable function which will generate a suitable cache object.
1521	1521	*
1522	1522	* The other parameters are dependent on the class used.
—	—	@@ -3956,7 +3956,7 @@
3957	3957	$wgStatsMethod = 'cache';
3958	3958
3959	3959	/**
3960		~~- * When $wgStatsMethod is 'udp', setting this to a string allows statistics to~~
	3960	+ * When $wgStatsMethod is 'udp', setting this to a string allows statistics to
3961	3961	* be aggregated over more than one wiki. The string will be used in place of
3962	3962	* the DB name in outgoing UDP packets. If this is set to false, the DB name
3963	3963	* will be used.
—	—	@@ -4639,15 +4639,15 @@
4640	4640	);
4641	4641
4642	4642	/**
4643		~~- * Extensions of "thumbnails" that are very expensive to regenerate and should be~~
4644		~~- * excluded from normal action=purge thumbnail removal.~~
	4643	+ * Extensions of "thumbnails" that are very expensive to regenerate and should be
	4644	+ * excluded from normal action=purge thumbnail removal.
4645	4645	*/
4646	4646	$wgExcludeFromThumbnailPurge = array();
4647	4647
4648	4648	/**
4649	4649
4650	4650	* Jobs that must be explicitly requested, i.e. aren't run by job runners unless special flags are set.
4651		- *
	4651	+ *
4652	4652	* These can be:
4653	4653	* - Very long-running jobs.
4654	4654	* - Jobs that you would never want to run as part of a page rendering request.
Index: trunk/phase3/includes/SpecialPage.php
—	—	@@ -572,10 +572,10 @@
573	573	function getTitle( $subpage = false ) {
574	574	return self::getTitleFor( $this->mName, $subpage );
575	575	}
576		-
	576	+
577	577	/**
578	578	* Sets the context this SpecialPage is executed in
579		- *
	579	+ *
580	580	* @param $context RequestContext
581	581	* @since 1.18
582	582	*/
—	—	@@ -585,7 +585,7 @@
586	586
587	587	/**
588	588	* Gets the context this SpecialPage is executed in
589		- *
	589	+ *
590	590	* @return RequestContext
591	591	* @since 1.18
592	592	*/
—	—	@@ -651,7 +651,7 @@
652	652	/**
653	653	* Wrapper around wfMessage that sets the current context. Currently this
654	654	* is only the title.
655		- *
	655	+ *
656	656	* @see wfMessage
657	657	*/
658	658	public function msg( /* $args */ ) {
—	—	@@ -832,7 +832,7 @@
833	833
834	834	// Query parameteres added by redirects
835	835	protected $mAddedRedirectParams = array();
836		-
	836	+
837	837	public function execute( $par ){
838	838	$redirect = $this->getRedirect( $par );
839	839	$query = $this->getRedirectQuery();
Index: trunk/phase3/languages/messages/MessagesEn.php
—	—	@@ -1722,16 +1722,16 @@
1723	1723	You can search via Google in the meantime.
1724	1724	Note that their indexes of {{SITENAME}} content may be out of date.',
1725	1725	'googlesearch' => '<form method="get" action="http://www.google.com/search" id="googlesearch">
1726		~~- <input type="hidden" name="domains" value="{{SERVER}}" />~~
1727		~~- <input type="hidden" name="num" value="50" />~~
1728		~~- <input type="hidden" name="ie" value="$2" />~~
1729		~~- <input type="hidden" name="oe" value="$2" />~~
	1726	+ <input type="hidden" name="domains" value="{{SERVER}}" />
	1727	+ <input type="hidden" name="num" value="50" />
	1728	+ <input type="hidden" name="ie" value="$2" />
	1729	+ <input type="hidden" name="oe" value="$2" />
1730	1730
1731		~~- <input type="text" name="q" size="31" maxlength="255" value="$1" />~~
1732		~~- <input type="submit" name="btnG" value="$3" />~~
	1731	+ <input type="text" name="q" size="31" maxlength="255" value="$1" />
	1732	+ <input type="submit" name="btnG" value="$3" />
1733	1733	<div>
1734		~~- <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}" checked="checked" /><label for="gwiki">{{SITENAME}}</label>~~
1735		~~- <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label>~~
	1734	+ <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}" checked="checked" /><label for="gwiki">{{SITENAME}}</label>
	1735	+ <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label>
1736	1736	</div>
1737	1737	</form>', # do not translate or duplicate this message to other languages
1738	1738
—	—	@@ -2767,7 +2767,7 @@
2768	2768	There will be no other notifications in case of further changes unless you visit this page.
2769	2769	You could also reset the notification flags for all your watched pages on your watchlist.
2770	2770
2771		~~- Your friendly {{SITENAME}} notification system~~
	2771	+ Your friendly {{SITENAME}} notification system
2772	2772
2773	2773	--
2774	2774	To change your email notification settings, visit
Index: trunk/phase3/languages/messages/MessagesDe.php
—	—	@@ -2306,7 +2306,7 @@
2307	2307
2308	2308	Es werden dir solange keine weiteren Benachrichtigungs-E-Mails gesendet, bis du die Seite wieder besucht hast. Auf deiner Beobachtungsliste kannst du alle Benachrichtigungsmarkierungen zusammen zurücksetzen.
2309	2309
2310		~~- Dein freundliches {{SITENAME}}-Benachrichtigungssystem~~
	2310	+ Dein freundliches {{SITENAME}}-Benachrichtigungssystem
2311	2311
2312	2312	--
2313	2313	Um die Einstellungen der E-Mail-Benachrichtigung anzupassen, besuche {{fullurl:{{#special:Preferences}}}}
—	—	@@ -2948,7 +2948,7 @@
2949	2949	#p-personal ul,
2950	2950	#p-cactions li a,
2951	2951	#preftoc a {
2952		~~- text-transform: none;~~
	2952	+ text-transform: none;
2953	2953	}',
2954	2954	'vector.css' => '/* Das folgende CSS wird für Benutzer der Vector-Benutzeroberfläche geladen. Für allgemeingültige Benutzeroberflächen-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
2955	2955	'print.css' => '/* Das folgende CSS wird in der Druckausgabe geladen. */',
Index: trunk/phase3/languages/Language.php
—	—	@@ -152,14 +152,14 @@
153	153	static $recursionLevel = 0;
154	154
155	155	// Protect against path traversal below
156		~~- if ( !Language::isValidCode( $code )~~
157		~~- \|\| strcspn( $code, ":/\\\000" ) !== strlen( $code ) )~~
	156	+ if ( !Language::isValidCode( $code )
	157	+ \|\| strcspn( $code, ":/\\\000" ) !== strlen( $code ) )
158	158	{
159	159	throw new MWException( "Invalid language code \"$code\"" );
160	160	}
161	161
162	162	if ( !Language::isValidBuiltInCode( $code ) ) {
163		~~- // It's not possible to customise this code with class files, so~~
	163	+ // It's not possible to customise this code with class files, so
164	164	// just return a Language object. This is to support uselang= hacks.
165	165	$lang = new Language;
166	166	$lang->setCode( $code );
—	—	@@ -198,18 +198,18 @@
199	199	}
200	200
201	201	/**
202		~~- * Returns true if a language code string is of a valid form, whether or~~
203		~~- * not it exists. This includes codes which are used solely for~~
	202	+ * Returns true if a language code string is of a valid form, whether or
	203	+ * not it exists. This includes codes which are used solely for
204	204	* customisation via the MediaWiki namespace.
205	205	*/
206	206	public static function isValidCode( $code ) {
207		~~- return~~
	207	+ return
208	208	strcspn( $code, ":/\\\000" ) === strlen( $code )
209	209	&& !preg_match( Title::getTitleInvalidRegex(), $code );
210	210	}
211	211
212	212	/**
213		~~- * Returns true if a language code is of a valid form for the purposes of~~
	213	+ * Returns true if a language code is of a valid form for the purposes of
214	214	* internal customisation of MediaWiki, via Messages*.php.
215	215	*/
216	216	public static function isValidBuiltInCode( $code ) {
—	—	@@ -590,15 +590,15 @@
591	591	function getMonthName( $key ) {
592	592	return $this->getMessageFromDB( self::$mMonthMsgs[$key - 1] );
593	593	}
594		-
	594	+
595	595	function getMonthNamesArray() {
596	596	$monthNames = array( '' );
597		~~- for ( $i=1; $i < 13; $i++ ) {~~
	597	+ for ( $i=1; $i < 13; $i++ ) {
598	598	$monthNames[] = $this->getMonthName( $i );
599	599	}
600	600	return $monthNames;
601	601	}
602		-
	602	+
603	603	function getMonthNameGen( $key ) {
604	604	return $this->getMessageFromDB( self::$mMonthGenMsgs[$key - 1] );
605	605	}
—	—	@@ -606,15 +606,15 @@
607	607	function getMonthAbbreviation( $key ) {
608	608	return $this->getMessageFromDB( self::$mMonthAbbrevMsgs[$key - 1] );
609	609	}
610		-
	610	+
611	611	function getMonthAbbreviationsArray() {
612	612	$monthNames = array('');
613		~~- for ( $i=1; $i < 13; $i++ ) {~~
	613	+ for ( $i=1; $i < 13; $i++ ) {
614	614	$monthNames[] = $this->getMonthAbbreviation( $i );
615	615	}
616	616	return $monthNames;
617	617	}
618		-
	618	+
619	619	function getWeekdayName( $key ) {
620	620	return $this->getMessageFromDB( self::$mWeekdayMsgs[$key - 1] );
621	621	}
—	—	@@ -2427,7 +2427,7 @@
2428	2428	}
2429	2429	# Do not truncate if the ellipsis makes the string longer/equal (bug 22181).
2430	2430	# This check is not redundant if $adjustLength, due to the single case where
2431		~~- # LEN($ellipsis) > ABS($limit arg); $stringOriginal could be shorter than $string.~~
	2431	+ # LEN($ellipsis) > ABS($limit arg); $stringOriginal could be shorter than $string.
2432	2432	if ( strlen( $string ) < strlen( $stringOriginal ) ) {
2433	2433	return $string;
2434	2434	} else {
—	—	@@ -2918,12 +2918,12 @@
2919	2919	*/
2920	2920	static function getFileName( $prefix = 'Language', $code, $suffix = '.php' ) {
2921	2921	// Protect against path traversal
2922		~~- if ( !Language::isValidCode( $code )~~
2923		~~- \|\| strcspn( $code, ":/\\\000" ) !== strlen( $code ) )~~
	2922	+ if ( !Language::isValidCode( $code )
	2923	+ \|\| strcspn( $code, ":/\\\000" ) !== strlen( $code ) )
2924	2924	{
2925	2925	throw new MWException( "Invalid language code \"$code\"" );
2926	2926	}
2927		-
	2927	+
2928	2928	return $prefix . str_replace( '-', '_', ucfirst( $code ) ) . $suffix;
2929	2929	}
2930	2930

Status & tagging log

15:46, 25 May 2011 😂 (talk | contribs) changed the status of r88797 [removed: new added: ok]