r69622 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r69621‎ \| r69622 \| r69623 >
Date:	15:12, 20 July 2010
Author:	mah
Status:	ok
Tags:
Comment:	revert r69620
Modified paths:	/trunk/phase3/includes/EditPage.php (modified) (history) /trunk/phase3/includes/normal/UtfNormal.php (modified) (history) /trunk/phase3/includes/parser/ParserCache.php (modified) (history) /trunk/phase3/maintenance/install.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/install.php
—	—	@@ -30,8 +30,8 @@
31	31
32	32	$this->addArg( 'name', 'The name of the wiki', true);
33	33
34		~~- $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', true);~~
35		~~- $this->addOption( 'pass', 'The password for the wiki administrator. You will be prompted for this if it isn\'t provided', false, true);~~
	34	+ $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', false);
	35	+ $this->addOption( 'pass', 'The password for the wiki administrator. You will be prompted for this if it isn\'t provided', false, true);
36	36	$this->addOption( 'email', 'The email for the wiki administrator', false, true);
37	37
38	38	$this->addOption( 'lang', 'The language to use (en)', false, true );
Index: trunk/phase3/includes/parser/ParserCache.php
—	—	@@ -4,8 +4,6 @@
5	5	* @todo document
6	6	*/
7	7	class ParserCache {
8		~~- private $mMemc;~~
9		-
10	8	/**
11	9	* Get an instance of this object
12	10	*/
—	—	@@ -25,10 +23,6 @@
26	24	* @param $memCached Object
27	25	*/
28	26	function __construct( $memCached ) {
29		~~- if ( !$memCached ) {~~
30		~~- global $parserMemc;~~
31		~~- $parserMemc = $memCached = wfGetParserCacheStorage();~~
32		~~- }~~
33	27	$this->mMemc = $memCached;
34	28	}
35	29
Index: trunk/phase3/includes/EditPage.php
—	—	@@ -17,30 +17,30 @@
18	18	* usually the same, but they are now allowed to be different.
19	19	*/
20	20	class EditPage {
21		~~- const AS_SUCCESS_UPDATE = 200;~~
22		~~- const AS_SUCCESS_NEW_ARTICLE = 201;~~
23		~~- const AS_HOOK_ERROR = 210;~~
24		~~- const AS_FILTERING = 211;~~
25		~~- const AS_HOOK_ERROR_EXPECTED = 212;~~
26		~~- const AS_BLOCKED_PAGE_FOR_USER = 215;~~
27		~~- const AS_CONTENT_TOO_BIG = 216;~~
28		~~- const AS_USER_CANNOT_EDIT = 217;~~
29		~~- const AS_READ_ONLY_PAGE_ANON = 218;~~
30		~~- const AS_READ_ONLY_PAGE_LOGGED = 219;~~
31		~~- const AS_READ_ONLY_PAGE = 220;~~
32		~~- const AS_RATE_LIMITED = 221;~~
33		~~- const AS_ARTICLE_WAS_DELETED = 222;~~
34		~~- const AS_NO_CREATE_PERMISSION = 223;~~
35		~~- const AS_BLANK_ARTICLE = 224;~~
36		~~- const AS_CONFLICT_DETECTED = 225;~~
37		~~- const AS_SUMMARY_NEEDED = 226;~~
38		~~- const AS_TEXTBOX_EMPTY = 228;~~
	21	+ const AS_SUCCESS_UPDATE = 200;
	22	+ const AS_SUCCESS_NEW_ARTICLE = 201;
	23	+ const AS_HOOK_ERROR = 210;
	24	+ const AS_FILTERING = 211;
	25	+ const AS_HOOK_ERROR_EXPECTED = 212;
	26	+ const AS_BLOCKED_PAGE_FOR_USER = 215;
	27	+ const AS_CONTENT_TOO_BIG = 216;
	28	+ const AS_USER_CANNOT_EDIT = 217;
	29	+ const AS_READ_ONLY_PAGE_ANON = 218;
	30	+ const AS_READ_ONLY_PAGE_LOGGED = 219;
	31	+ const AS_READ_ONLY_PAGE = 220;
	32	+ const AS_RATE_LIMITED = 221;
	33	+ const AS_ARTICLE_WAS_DELETED = 222;
	34	+ const AS_NO_CREATE_PERMISSION = 223;
	35	+ const AS_BLANK_ARTICLE = 224;
	36	+ const AS_CONFLICT_DETECTED = 225;
	37	+ const AS_SUMMARY_NEEDED = 226;
	38	+ const AS_TEXTBOX_EMPTY = 228;
39	39	const AS_MAX_ARTICLE_SIZE_EXCEEDED = 229;
40		~~- const AS_OK = 230;~~
41		~~- const AS_END = 231;~~
42		~~- const AS_SPAM_ERROR = 232;~~
43		~~- const AS_IMAGE_REDIRECT_ANON = 233;~~
44		~~- const AS_IMAGE_REDIRECT_LOGGED = 234;~~
	40	+ const AS_OK = 230;
	41	+ const AS_END = 231;
	42	+ const AS_SPAM_ERROR = 232;
	43	+ const AS_IMAGE_REDIRECT_ANON = 233;
	44	+ const AS_IMAGE_REDIRECT_LOGGED = 234;
45	45
46	46	var $mArticle;
47	47	var $mTitle;
—	—	@@ -129,8 +129,8 @@
130	130	wfProfileIn( __METHOD__ );
131	131	# Get variables from query string :P
132	132	$section = $wgRequest->getVal( 'section' );
133		-
134		~~- $preload = $wgRequest->getVal( 'preload',~~
	133	+
	134	+ $preload = $wgRequest->getVal( 'preload',
135	135	// Custom preload text for new sections
136	136	$section === 'new' ? 'MediaWiki:addsection-preload' : '' );
137	137	$undoafter = $wgRequest->getVal( 'undoafter' );
—	—	@@ -287,7 +287,7 @@
288	288	*
289	289	* The edit form is self-submitting, so that when things like
290	290	* preview and edit conflicts occur, we get the same form back
291		~~- * with the extra stuff added. Only when the final submission~~
	291	+ * with the extra stuff added. Only when the final submission
292	292	* is made and all is well do we actually save and redirect to
293	293	* the newly-edited page.
294	294	*/
—	—	@@ -320,7 +320,7 @@
321	321	}
322	322
323	323	$wgOut->addScriptFile( 'edit.js' );
324		-
	324	+
325	325	if ( $wgUser->getOption( 'uselivepreview', false ) ) {
326	326	$wgOut->includeJQuery();
327	327	$wgOut->addScriptFile( 'preview.js' );
—	—	@@ -360,9 +360,9 @@
361	361
362	362	$this->isConflict = false;
363	363	// css / js subpages of user pages get a special treatment
364		~~- $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage();~~
365		~~- $this->isCssSubpage = $this->mTitle->isCssSubpage();~~
366		~~- $this->isJsSubpage = $this->mTitle->isJsSubpage();~~
	364	+ $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage();
	365	+ $this->isCssSubpage = $this->mTitle->isCssSubpage();
	366	+ $this->isJsSubpage = $this->mTitle->isJsSubpage();
367	367	$this->isValidCssJsSubpage = $this->mTitle->isValidCssJsSubpage();
368	368
369	369	# Show applicable editing introductions
—	—	@@ -374,9 +374,9 @@
375	375	}
376	376
377	377	# Optional notices on a per-namespace and per-page basis
378		~~- $editnotice_ns = 'editnotice-'.$this->mTitle->getNamespace();~~
	378	+ $editnotice_ns = 'editnotice-'.$this->mTitle->getNamespace();
379	379	if ( !wfEmptyMsg( $editnotice_ns, wfMsgForContent( $editnotice_ns ) ) ) {
380		~~- $wgOut->addWikiText( wfMsgForContent( $editnotice_ns ) );~~
	380	+ $wgOut->addWikiText( wfMsgForContent( $editnotice_ns ) );
381	381	}
382	382	if ( MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
383	383	$parts = explode( '/', $this->mTitle->getDBkey() );
—	—	@@ -389,7 +389,7 @@
390	390	}
391	391	}
392	392
393		~~- # Attempt submission here. This will check for edit conflicts,~~
	393	+ # Attempt submission here. This will check for edit conflicts,
394	394	# and redundantly check for locked database, blocked IPs, etc.
395	395	# that edit() already checked just in case someone tries to sneak
396	396	# in the back door with a hand-edited submission URL.
—	—	@@ -493,7 +493,7 @@
494	494	/**
495	495	* Does this EditPage class support section editing?
496	496	* This is used by EditPage subclasses to indicate their ui cannot handle section edits
497		- *
	497	+ *
498	498	* @return bool
499	499	*/
500	500	protected function isSectionEditSupported() {
—	—	@@ -505,7 +505,7 @@
506	506	* This is used by EditPage subclasses when simply customizing the action
507	507	* variable in the constructor is not enough. This can be used when the
508	508	* EditPage lives inside of a Special page rather than a custom page action.
509		- *
	509	+ *
510	510	* @param $title Title object for which is being edited (where we go to for &action= links)
511	511	* @return string
512	512	*/
—	—	@@ -591,7 +591,7 @@
592	592	$this->starttime = null;
593	593	}
594	594
595		~~- $this->recreate = $request->getCheck( 'wpRecreate' );~~
	595	+ $this->recreate = $request->getCheck( 'wpRecreate' );
596	596
597	597	$this->minoredit = $request->getCheck( 'wpMinoredit' );
598	598	$this->watchthis = $request->getCheck( 'wpWatchthis' );
—	—	@@ -609,17 +609,17 @@
610	610	} else {
611	611	# Not a posted form? Start with nothing.
612	612	wfDebug( __METHOD__ . ": Not a posted form.\n" );
613		~~- $this->textbox1 = '';~~
614		~~- $this->summary = '';~~
615		~~- $this->edittime = '';~~
	613	+ $this->textbox1 = '';
	614	+ $this->summary = '';
	615	+ $this->edittime = '';
616	616	$this->starttime = wfTimestampNow();
617		~~- $this->edit = false;~~
618		~~- $this->preview = false;~~
619		~~- $this->save = false;~~
620		~~- $this->diff = false;~~
	617	+ $this->edit = false;
	618	+ $this->preview = false;
	619	+ $this->save = false;
	620	+ $this->diff = false;
621	621	$this->minoredit = false;
622	622	$this->watchthis = $request->getBool( 'watchthis', false ); // Watch may be overriden by request parameters
623		~~- $this->recreate = false;~~
	623	+ $this->recreate = false;
624	624
625	625	if ( $this->section == 'new' && $request->getVal( 'preloadtitle' ) ) {
626	626	$this->summary = $request->getVal( 'preloadtitle' );
—	—	@@ -655,7 +655,7 @@
656	656	* posted form to be placed in $this->textbox1, if using customized input
657	657	* this method should be overrided and return the page text that will be used
658	658	* for saving, preview parsing and so on...
659		- *
	659	+ *
660	660	* @param $request WebRequest
661	661	*/
662	662	protected function importContentFormData( &$request ) {
—	—	@@ -768,7 +768,7 @@
769	769	global $wgFilterCallback, $wgUser, $wgOut, $wgParser;
770	770	global $wgMaxArticleSize;
771	771
772		~~- wfProfileIn( __METHOD__ );~~
	772	+ wfProfileIn( __METHOD__ );
773	773	wfProfileIn( __METHOD__ . '-checks' );
774	774
775	775	if ( !wfRunHooks( 'EditPage::attemptSave', array( $this ) ) ) {
—	—	@@ -1064,10 +1064,11 @@
1065	1065	$flags = EDIT_UPDATE \| EDIT_DEFER_UPDATES \| EDIT_AUTOSUMMARY \|
1066	1066	( $this->minoredit ? EDIT_MINOR : 0 ) \|
1067	1067	( $bot ? EDIT_FORCE_BOT : 0 );
1068		~~- $status = $this->mArticle->doEdit( $text, $this->summary, $flags,~~
	1068	+ $status = $this->mArticle->doEdit( $text, $this->summary, $flags,
1069	1069	false, null, $this->watchthis, false, $sectionanchor, true );
1070		-
1071		~~- if ( $status->isOK() ) {~~
	1070	+
	1071	+ if ( $status->isOK() )
	1072	+ {
1072	1073	wfProfileOut( __METHOD__ );
1073	1074	return self::AS_SUCCESS_UPDATE;
1074	1075	} else {
—	—	@@ -1185,8 +1186,8 @@
1186	1187	/**
1187	1188	* Send the edit form and related headers to $wgOut
1188	1189	* @param $formCallback Optional callable that takes an OutputPage
1189		~~- * parameter; will be called during form output~~
1190		~~- * near the top, for captchas and the like.~~
	1190	+ * parameter; will be called during form output
	1191	+ * near the top, for captchas and the like.
1191	1192	*/
1192	1193	function showEditForm( $formCallback=null ) {
1193	1194	global $wgOut, $wgUser, $wgTitle;
—	—	@@ -1302,7 +1303,7 @@
1303	1304	}
1304	1305
1305	1306	$wgOut->addHTML( $this->editFormTextBeforeContent );
1306		-
	1307	+
1307	1308	if ( $this->isConflict ) {
1308	1309	// In an edit conflict bypass the overrideable content form method
1309	1310	// and fallback to the raw wpTextbox1 since editconflicts can't be
—	—	@@ -1339,7 +1340,7 @@
1340	1341
1341	1342	if ( $this->isConflict )
1342	1343	$this->showConflict();
1343		-
	1344	+
1344	1345	$wgOut->addHTML( $this->editFormTextBottom );
1345	1346	$wgOut->addHTML( "</form>\n" );
1346	1347	if ( !$wgUser->getOption( 'previewontop' ) ) {
—	—	@@ -1348,7 +1349,7 @@
1349	1350
1350	1351	wfProfileOut( __METHOD__ );
1351	1352	}
1352		-
	1353	+
1353	1354	protected function showHeader() {
1354	1355	global $wgOut, $wgUser, $wgTitle, $wgMaxArticleSize, $wgLang;
1355	1356	if ( $this->isConflict ) {
—	—	@@ -1462,7 +1463,7 @@
1463	1464	}
1464	1465	if ( !$this->mTitle->exists() && $this->mTitle->getRestrictions( 'create' ) ) {
1465	1466	LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle->getPrefixedText(), '',
1466		~~- array( 'lim' => 1,~~
	1467	+ array( 'lim' => 1,
1467	1468	'showIfEmpty' => false,
1468	1469	'msgKey' => array( 'titleprotectedwarning' ),
1469	1470	'wrap' => "<div class=\"mw-titleprotectedwarning\">\n$1</div>" ) );
—	—	@@ -1489,12 +1490,12 @@
1490	1491	* Note that you do not need to worry about the label's for=, it will be
1491	1492	* inferred by the id given to the input. You can remove them both by
1492	1493	* passing array( 'id' => false ) to $userInputAttrs.
1493		- *
	1494	+ *
1494	1495	* @param $summary The value of the summary input
1495	1496	* @param $labelText The html to place inside the label
1496	1497	* @param $inputAttrs An array of attrs to use on the input
1497	1498	* @param $spanLabelAttrs An array of attrs to use on the span inside the label
1498		- *
	1499	+ *
1499	1500	* @return array An array in the format array( $label, $input )
1500	1501	*/
1501	1502	function getSummaryInput($summary = "", $labelText = null, $inputAttrs = null, $spanLabelAttrs = null) {
—	—	@@ -1526,8 +1527,8 @@
1527	1528
1528	1529	/**
1529	1530	* @param $isSubjectPreview Boolean: true if this is the section subject/title
1530		~~- * up top, or false if this is the comment summary~~
1531		~~- * down below the textarea~~
	1531	+ * up top, or false if this is the comment summary
	1532	+ * down below the textarea
1532	1533	* @param $summary String: The text of the summary to display
1533	1534	* @return String
1534	1535	*/
—	—	@@ -1550,18 +1551,18 @@
1551	1552
1552	1553	/**
1553	1554	* @param $isSubjectPreview Boolean: true if this is the section subject/title
1554		~~- * up top, or false if this is the comment summary~~
1555		~~- * down below the textarea~~
	1555	+ * up top, or false if this is the comment summary
	1556	+ * down below the textarea
1556	1557	* @param $summary String: the text of the summary to display
1557	1558	* @return String
1558	1559	*/
1559	1560	protected function getSummaryPreview( $isSubjectPreview, $summary = "" ) {
1560	1561	if ( !$summary \|\| ( !$this->preview && !$this->diff ) )
1561	1562	return "";
1562		-
	1563	+
1563	1564	global $wgParser, $wgUser;
1564	1565	$sk = $wgUser->getSkin();
1565		-
	1566	+
1566	1567	if ( $isSubjectPreview )
1567	1568	$summary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $summary ) );
1568	1569
—	—	@@ -1585,7 +1586,7 @@
1586	1587	if ( !$this->checkUnicodeCompliantBrowser() )
1587	1588	$wgOut->addHTML(Xml::hidden( 'safemode', '1' ));
1588	1589	}
1589		-
	1590	+
1590	1591	protected function showFormAfterText() {
1591	1592	global $wgOut, $wgUser;
1592	1593	/**
—	—	@@ -1610,7 +1611,7 @@
1611	1612	* be it a form, or simply wpTextbox1 with a modified content that will be
1612	1613	* reverse modified when extracted from the post data.
1613	1614	* Note that this is basically the inverse for importContentFormData
1614		- *
	1615	+ *
1615	1616	* @param $request WebRequest
1616	1617	*/
1617	1618	protected function showContentForm() {
—	—	@@ -1621,7 +1622,7 @@
1622	1623	* Method to output wpTextbox1
1623	1624	* The $textoverride method can be used by subclasses overriding showContentForm
1624	1625	* to pass back to this method.
1625		- *
	1626	+ *
1626	1627	* @param $customAttribs An array of html attributes to use in the textarea
1627	1628	* @param $textoverride String: optional text to override $this->textarea1 with
1628	1629	*/
—	—	@@ -1647,7 +1648,7 @@
1648	1649	$classes[] = $attribs['class'];
1649	1650	$attribs['class'] = implode( ' ', $classes );
1650	1651	}
1651		-
	1652	+
1652	1653	$this->showTextbox( isset($textoverride) ? $textoverride : $this->textbox1, 'wpTextbox1', $attribs );
1653	1654	}
1654	1655
—	—	@@ -1670,7 +1671,7 @@
1671	1672	$attribs = $customAttribs + array(
1672	1673	'accesskey' => ',',
1673	1674	'id' => $name,
1674		~~- 'cols' => $wgUser->getIntOption( 'cols' ),~~
	1675	+ 'cols' => $wgUser->getIntOption( 'cols' ),
1675	1676	'rows' => $wgUser->getIntOption( 'rows' ),
1676	1677	'style' => '' // avoid php notices when appending preferences (appending allows customAttribs['style'] to still work
1677	1678	);
—	—	@@ -1726,7 +1727,7 @@
1727	1728	* Give a chance for site and per-namespace customizations of
1728	1729	* terms of service summary link that might exist separately
1729	1730	* from the copyright notice.
1730		- *
	1731	+ *
1731	1732	* This will display between the save button and the edit tools,
1732	1733	* so should remain short!
1733	1734	*/
—	—	@@ -1748,7 +1749,7 @@
1749	1750	$wgOut->addWikiMsgArray( 'edittools', array(), array( 'content' ) );
1750	1751	$wgOut->addHTML( '</div>' );
1751	1752	}
1752		-
	1753	+
1753	1754	protected function getCopywarn() {
1754	1755	global $wgRightsText;
1755	1756	if ( $wgRightsText ) {
—	—	@@ -1761,10 +1762,10 @@
1762	1763	}
1763	1764	// Allow for site and per-namespace customization of contribution/copyright notice.
1764	1765	wfRunHooks( 'EditPageCopyrightWarning', array( $this->mTitle, &$copywarnMsg ) );
1765		-
	1766	+
1766	1767	return "<div id=\"editpage-copywarn\">\n" . call_user_func_array("wfMsgNoTrans", $copywarnMsg) . "\n</div>";
1767	1768	}
1768		-
	1769	+
1769	1770	protected function showStandardInputs( &$tabindex = 2 ) {
1770	1771	global $wgOut, $wgUser;
1771	1772	$wgOut->addHTML( "<div class='editOptions'>\n" );
—	—	@@ -1815,20 +1816,20 @@
1816	1817	$data = $dbr->selectRow(
1817	1818	array( 'logging', 'user' ),
1818	1819	array( 'log_type',
1819		~~- 'log_action',~~
1820		~~- 'log_timestamp',~~
1821		~~- 'log_user',~~
1822		~~- 'log_namespace',~~
1823		~~- 'log_title',~~
1824		~~- 'log_comment',~~
1825		~~- 'log_params',~~
1826		~~- 'log_deleted',~~
1827		~~- 'user_name' ),~~
	1820	+ 'log_action',
	1821	+ 'log_timestamp',
	1822	+ 'log_user',
	1823	+ 'log_namespace',
	1824	+ 'log_title',
	1825	+ 'log_comment',
	1826	+ 'log_params',
	1827	+ 'log_deleted',
	1828	+ 'user_name' ),
1828	1829	array( 'log_namespace' => $this->mTitle->getNamespace(),
1829		~~- 'log_title' => $this->mTitle->getDBkey(),~~
1830		~~- 'log_type' => 'delete',~~
1831		~~- 'log_action' => 'delete',~~
1832		~~- 'user_id=log_user' ),~~
	1830	+ 'log_title' => $this->mTitle->getDBkey(),
	1831	+ 'log_type' => 'delete',
	1832	+ 'log_action' => 'delete',
	1833	+ 'user_id=log_user' ),
1833	1834	__METHOD__,
1834	1835	array( 'LIMIT' => 1, 'ORDER BY' => 'log_timestamp DESC' )
1835	1836	);
—	—	@@ -2138,103 +2139,103 @@
2139	2140	*/
2140	2141	$toolarray = array(
2141	2142	array(
2142		~~- 'image' => $wgLang->getImageFile( 'button-bold' ),~~
2143		~~- 'id' => 'mw-editbutton-bold',~~
2144		~~- 'open' => '\'\'\'',~~
2145		~~- 'close' => '\'\'\'',~~
	2143	+ 'image' => $wgLang->getImageFile( 'button-bold' ),
	2144	+ 'id' => 'mw-editbutton-bold',
	2145	+ 'open' => '\'\'\'',
	2146	+ 'close' => '\'\'\'',
2146	2147	'sample' => wfMsg( 'bold_sample' ),
2147		~~- 'tip' => wfMsg( 'bold_tip' ),~~
2148		~~- 'key' => 'B'~~
	2148	+ 'tip' => wfMsg( 'bold_tip' ),
	2149	+ 'key' => 'B'
2149	2150	),
2150	2151	array(
2151		~~- 'image' => $wgLang->getImageFile( 'button-italic' ),~~
2152		~~- 'id' => 'mw-editbutton-italic',~~
2153		~~- 'open' => '\'\'',~~
2154		~~- 'close' => '\'\'',~~
	2152	+ 'image' => $wgLang->getImageFile( 'button-italic' ),
	2153	+ 'id' => 'mw-editbutton-italic',
	2154	+ 'open' => '\'\'',
	2155	+ 'close' => '\'\'',
2155	2156	'sample' => wfMsg( 'italic_sample' ),
2156		~~- 'tip' => wfMsg( 'italic_tip' ),~~
2157		~~- 'key' => 'I'~~
	2157	+ 'tip' => wfMsg( 'italic_tip' ),
	2158	+ 'key' => 'I'
2158	2159	),
2159	2160	array(
2160		~~- 'image' => $wgLang->getImageFile( 'button-link' ),~~
2161		~~- 'id' => 'mw-editbutton-link',~~
2162		~~- 'open' => '[[',~~
2163		~~- 'close' => ']]',~~
	2161	+ 'image' => $wgLang->getImageFile( 'button-link' ),
	2162	+ 'id' => 'mw-editbutton-link',
	2163	+ 'open' => '[[',
	2164	+ 'close' => ']]',
2164	2165	'sample' => wfMsg( 'link_sample' ),
2165		~~- 'tip' => wfMsg( 'link_tip' ),~~
2166		~~- 'key' => 'L'~~
	2166	+ 'tip' => wfMsg( 'link_tip' ),
	2167	+ 'key' => 'L'
2167	2168	),
2168	2169	array(
2169		~~- 'image' => $wgLang->getImageFile( 'button-extlink' ),~~
2170		~~- 'id' => 'mw-editbutton-extlink',~~
2171		~~- 'open' => '[',~~
2172		~~- 'close' => ']',~~
	2170	+ 'image' => $wgLang->getImageFile( 'button-extlink' ),
	2171	+ 'id' => 'mw-editbutton-extlink',
	2172	+ 'open' => '[',
	2173	+ 'close' => ']',
2173	2174	'sample' => wfMsg( 'extlink_sample' ),
2174		~~- 'tip' => wfMsg( 'extlink_tip' ),~~
2175		~~- 'key' => 'X'~~
	2175	+ 'tip' => wfMsg( 'extlink_tip' ),
	2176	+ 'key' => 'X'
2176	2177	),
2177	2178	array(
2178		~~- 'image' => $wgLang->getImageFile( 'button-headline' ),~~
2179		~~- 'id' => 'mw-editbutton-headline',~~
2180		~~- 'open' => "\n== ",~~
2181		~~- 'close' => " ==\n",~~
	2179	+ 'image' => $wgLang->getImageFile( 'button-headline' ),
	2180	+ 'id' => 'mw-editbutton-headline',
	2181	+ 'open' => "\n== ",
	2182	+ 'close' => " ==\n",
2182	2183	'sample' => wfMsg( 'headline_sample' ),
2183		~~- 'tip' => wfMsg( 'headline_tip' ),~~
2184		~~- 'key' => 'H'~~
	2184	+ 'tip' => wfMsg( 'headline_tip' ),
	2185	+ 'key' => 'H'
2185	2186	),
2186	2187	array(
2187		~~- 'image' => $wgLang->getImageFile( 'button-image' ),~~
2188		~~- 'id' => 'mw-editbutton-image',~~
2189		~~- 'open' => '[[' . $wgContLang->getNsText( NS_FILE ) . ':',~~
2190		~~- 'close' => ']]',~~
	2188	+ 'image' => $wgLang->getImageFile( 'button-image' ),
	2189	+ 'id' => 'mw-editbutton-image',
	2190	+ 'open' => '[[' . $wgContLang->getNsText( NS_FILE ) . ':',
	2191	+ 'close' => ']]',
2191	2192	'sample' => wfMsg( 'image_sample' ),
2192		~~- 'tip' => wfMsg( 'image_tip' ),~~
2193		~~- 'key' => 'D'~~
	2193	+ 'tip' => wfMsg( 'image_tip' ),
	2194	+ 'key' => 'D'
2194	2195	),
2195	2196	array(
2196		~~- 'image' => $wgLang->getImageFile( 'button-media' ),~~
2197		~~- 'id' => 'mw-editbutton-media',~~
2198		~~- 'open' => '[[' . $wgContLang->getNsText( NS_MEDIA ) . ':',~~
2199		~~- 'close' => ']]',~~
	2197	+ 'image' => $wgLang->getImageFile( 'button-media' ),
	2198	+ 'id' => 'mw-editbutton-media',
	2199	+ 'open' => '[[' . $wgContLang->getNsText( NS_MEDIA ) . ':',
	2200	+ 'close' => ']]',
2200	2201	'sample' => wfMsg( 'media_sample' ),
2201		~~- 'tip' => wfMsg( 'media_tip' ),~~
2202		~~- 'key' => 'M'~~
	2202	+ 'tip' => wfMsg( 'media_tip' ),
	2203	+ 'key' => 'M'
2203	2204	),
2204	2205	array(
2205		~~- 'image' => $wgLang->getImageFile( 'button-math' ),~~
2206		~~- 'id' => 'mw-editbutton-math',~~
2207		~~- 'open' => "<math>",~~
2208		~~- 'close' => "</math>",~~
	2206	+ 'image' => $wgLang->getImageFile( 'button-math' ),
	2207	+ 'id' => 'mw-editbutton-math',
	2208	+ 'open' => "<math>",
	2209	+ 'close' => "</math>",
2209	2210	'sample' => wfMsg( 'math_sample' ),
2210		~~- 'tip' => wfMsg( 'math_tip' ),~~
2211		~~- 'key' => 'C'~~
	2211	+ 'tip' => wfMsg( 'math_tip' ),
	2212	+ 'key' => 'C'
2212	2213	),
2213	2214	array(
2214		~~- 'image' => $wgLang->getImageFile( 'button-nowiki' ),~~
2215		~~- 'id' => 'mw-editbutton-nowiki',~~
2216		~~- 'open' => "<nowiki>",~~
2217		~~- 'close' => "</nowiki>",~~
	2215	+ 'image' => $wgLang->getImageFile( 'button-nowiki' ),
	2216	+ 'id' => 'mw-editbutton-nowiki',
	2217	+ 'open' => "<nowiki>",
	2218	+ 'close' => "</nowiki>",
2218	2219	'sample' => wfMsg( 'nowiki_sample' ),
2219		~~- 'tip' => wfMsg( 'nowiki_tip' ),~~
2220		~~- 'key' => 'N'~~
	2220	+ 'tip' => wfMsg( 'nowiki_tip' ),
	2221	+ 'key' => 'N'
2221	2222	),
2222	2223	array(
2223		~~- 'image' => $wgLang->getImageFile( 'button-sig' ),~~
2224		~~- 'id' => 'mw-editbutton-signature',~~
2225		~~- 'open' => '--~~~~',~~
2226		~~- 'close' => '',~~
	2224	+ 'image' => $wgLang->getImageFile( 'button-sig' ),
	2225	+ 'id' => 'mw-editbutton-signature',
	2226	+ 'open' => '--~~~~',
	2227	+ 'close' => '',
2227	2228	'sample' => '',
2228		~~- 'tip' => wfMsg( 'sig_tip' ),~~
2229		~~- 'key' => 'Y'~~
	2229	+ 'tip' => wfMsg( 'sig_tip' ),
	2230	+ 'key' => 'Y'
2230	2231	),
2231	2232	array(
2232		~~- 'image' => $wgLang->getImageFile( 'button-hr' ),~~
2233		~~- 'id' => 'mw-editbutton-hr',~~
2234		~~- 'open' => "\n----\n",~~
2235		~~- 'close' => '',~~
	2233	+ 'image' => $wgLang->getImageFile( 'button-hr' ),
	2234	+ 'id' => 'mw-editbutton-hr',
	2235	+ 'open' => "\n----\n",
	2236	+ 'close' => '',
2236	2237	'sample' => '',
2237		~~- 'tip' => wfMsg( 'hr_tip' ),~~
2238		~~- 'key' => 'R'~~
	2238	+ 'tip' => wfMsg( 'hr_tip' ),
	2239	+ 'key' => 'R'
2239	2240	)
2240	2241	);
2241	2242	$toolbar = "<div id='toolbar'>\n";
—	—	@@ -2274,7 +2275,7 @@
2275	2276	* @param $tabindex Current tabindex
2276	2277	* @param $skin Skin object
2277	2278	* @param $checked Array of checkbox => bool, where bool indicates the checked
2278		~~- * status of the checkbox~~
	2279	+ * status of the checkbox
2279	2280	*
2280	2281	* @return array
2281	2282	*/
—	—	@@ -2287,9 +2288,9 @@
2288	2289	$minorLabel = wfMsgExt( 'minoredit', array( 'parseinline' ) );
2289	2290	if ( $wgUser->isAllowed( 'minoredit' ) ) {
2290	2291	$attribs = array(
2291		~~- 'tabindex' => ++$tabindex,~~
	2292	+ 'tabindex' => ++$tabindex,
2292	2293	'accesskey' => wfMsg( 'accesskey-minoredit' ),
2293		~~- 'id' => 'wpMinoredit',~~
	2294	+ 'id' => 'wpMinoredit',
2294	2295	);
2295	2296	$checkboxes['minor'] =
2296	2297	Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) .
—	—	@@ -2300,9 +2301,9 @@
2301	2302	$checkboxes['watch'] = '';
2302	2303	if ( $wgUser->isLoggedIn() ) {
2303	2304	$attribs = array(
2304		~~- 'tabindex' => ++$tabindex,~~
	2305	+ 'tabindex' => ++$tabindex,
2305	2306	'accesskey' => wfMsg( 'accesskey-watch' ),
2306		~~- 'id' => 'wpWatchthis',~~
	2307	+ 'id' => 'wpWatchthis',
2307	2308	);
2308	2309	$checkboxes['watch'] =
2309	2310	Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) .
—	—	@@ -2324,37 +2325,37 @@
2325	2326	$buttons = array();
2326	2327
2327	2328	$temp = array(
2328		~~- 'id' => 'wpSave',~~
2329		~~- 'name' => 'wpSave',~~
2330		~~- 'type' => 'submit',~~
2331		~~- 'tabindex' => ++$tabindex,~~
2332		~~- 'value' => wfMsg( 'savearticle' ),~~
	2329	+ 'id' => 'wpSave',
	2330	+ 'name' => 'wpSave',
	2331	+ 'type' => 'submit',
	2332	+ 'tabindex' => ++$tabindex,
	2333	+ 'value' => wfMsg( 'savearticle' ),
2333	2334	'accesskey' => wfMsg( 'accesskey-save' ),
2334		~~- 'title' => wfMsg( 'tooltip-save' ).' ['.wfMsg( 'accesskey-save' ).']',~~
	2335	+ 'title' => wfMsg( 'tooltip-save' ).' ['.wfMsg( 'accesskey-save' ).']',
2335	2336	);
2336	2337	$buttons['save'] = Xml::element('input', $temp, '');
2337	2338
2338	2339	++$tabindex; // use the same for preview and live preview
2339	2340	$temp = array(
2340		~~- 'id' => 'wpPreview',~~
2341		~~- 'name' => 'wpPreview',~~
2342		~~- 'type' => 'submit',~~
2343		~~- 'tabindex' => $tabindex,~~
2344		~~- 'value' => wfMsg( 'showpreview' ),~~
	2341	+ 'id' => 'wpPreview',
	2342	+ 'name' => 'wpPreview',
	2343	+ 'type' => 'submit',
	2344	+ 'tabindex' => $tabindex,
	2345	+ 'value' => wfMsg( 'showpreview' ),
2345	2346	'accesskey' => wfMsg( 'accesskey-preview' ),
2346		~~- 'title' => wfMsg( 'tooltip-preview' ) . ' [' . wfMsg( 'accesskey-preview' ) . ']',~~
	2347	+ 'title' => wfMsg( 'tooltip-preview' ) . ' [' . wfMsg( 'accesskey-preview' ) . ']',
2347	2348	);
2348	2349	$buttons['preview'] = Xml::element( 'input', $temp, '' );
2349	2350	$buttons['live'] = '';
2350	2351
2351	2352	$temp = array(
2352		~~- 'id' => 'wpDiff',~~
2353		~~- 'name' => 'wpDiff',~~
2354		~~- 'type' => 'submit',~~
2355		~~- 'tabindex' => ++$tabindex,~~
2356		~~- 'value' => wfMsg( 'showdiff' ),~~
	2353	+ 'id' => 'wpDiff',
	2354	+ 'name' => 'wpDiff',
	2355	+ 'type' => 'submit',
	2356	+ 'tabindex' => ++$tabindex,
	2357	+ 'value' => wfMsg( 'showdiff' ),
2357	2358	'accesskey' => wfMsg( 'accesskey-diff' ),
2358		~~- 'title' => wfMsg( 'tooltip-diff' ) . ' [' . wfMsg( 'accesskey-diff' ) . ']',~~
	2359	+ 'title' => wfMsg( 'tooltip-diff' ) . ' [' . wfMsg( 'accesskey-diff' ) . ']',
2359	2360	);
2360	2361	$buttons['diff'] = Xml::element( 'input', $temp, '' );
2361	2362
—	—	@@ -2370,9 +2371,9 @@
2371	2372	* failure, etc).
2372	2373	*
2373	2374	* @todo This doesn't include category or interlanguage links.
2374		~~- * Would need to enhance it a bit, <s>maybe wrap them in XML~~
2375		~~- * or something...</s> that might also require more skin~~
2376		~~- * initialization, so check whether that's a problem.~~
	2375	+ * Would need to enhance it a bit, <s>maybe wrap them in XML
	2376	+ * or something...</s> that might also require more skin
	2377	+ * initialization, so check whether that's a problem.
2377	2378	*/
2378	2379	function livePreview() {
2379	2380	global $wgOut;
—	—	@@ -2427,7 +2428,7 @@
2428	2429	$newtext = $this->mArticle->preSaveTransform( $newtext );
2429	2430	$oldtitle = wfMsgExt( 'currentrev', array( 'parseinline' ) );
2430	2431	$newtitle = wfMsgExt( 'yourtext', array( 'parseinline' ) );
2431		~~- if ( $oldtext !== false \|\| $newtext != '' ) {~~
	2432	+ if ( $oldtext !== false \|\| $newtext != '' ) {
2432	2433	$de = new DifferenceEngine( $this->mTitle );
2433	2434	$de->setText( $oldtext, $newtext );
2434	2435	$difftext = $de->getDiff( $oldtitle, $newtitle );
—	—	@@ -2587,7 +2588,7 @@
2588	2589	switch ( $value ) {
2589	2590	case self::AS_HOOK_ERROR_EXPECTED:
2590	2591	case self::AS_CONTENT_TOO_BIG:
2591		~~- case self::AS_ARTICLE_WAS_DELETED:~~
	2592	+ case self::AS_ARTICLE_WAS_DELETED:
2592	2593	case self::AS_CONFLICT_DETECTED:
2593	2594	case self::AS_SUMMARY_NEEDED:
2594	2595	case self::AS_TEXTBOX_EMPTY:
—	—	@@ -2617,22 +2618,22 @@
2618	2619	$this->userNotLoggedInPage();
2619	2620	return false;
2620	2621
2621		~~- case self::AS_READ_ONLY_PAGE_LOGGED:~~
2622		~~- case self::AS_READ_ONLY_PAGE:~~
2623		~~- $wgOut->readOnlyPage();~~
2624		~~- return false;~~
	2622	+ case self::AS_READ_ONLY_PAGE_LOGGED:
	2623	+ case self::AS_READ_ONLY_PAGE:
	2624	+ $wgOut->readOnlyPage();
	2625	+ return false;
2625	2626
2626		~~- case self::AS_RATE_LIMITED:~~
2627		~~- $wgOut->rateLimited();~~
2628		~~- return false;~~
	2627	+ case self::AS_RATE_LIMITED:
	2628	+ $wgOut->rateLimited();
	2629	+ return false;
2629	2630
2630		~~- case self::AS_NO_CREATE_PERMISSION:~~
2631		~~- $this->noCreatePermission();~~
2632		~~- return;~~
	2631	+ case self::AS_NO_CREATE_PERMISSION:
	2632	+ $this->noCreatePermission();
	2633	+ return;
2633	2634
2634	2635	case self::AS_BLANK_ARTICLE:
2635		~~- $wgOut->redirect( $wgTitle->getFullURL() );~~
2636		~~- return false;~~
	2636	+ $wgOut->redirect( $wgTitle->getFullURL() );
	2637	+ return false;
2637	2638
2638	2639	case self::AS_IMAGE_REDIRECT_LOGGED:
2639	2640	$wgOut->permissionRequired( 'upload' );
—	—	@@ -2649,5 +2650,5 @@
2650	2651	} else {
2651	2652	return $this->mBaseRevision;
2652	2653	}
2653		~~- }~~
	2654	+ }
2654	2655	}
Index: trunk/phase3/includes/normal/UtfNormal.php
—	—	@@ -45,7 +45,6 @@
46	46	define( 'UNORM_FCD', 6 );
47	47
48	48	define( 'NORMALIZE_ICU', function_exists( 'utf8_normalize' ) );
49		~~-define( 'NORMALIZE_INTL', function_exists( 'normalizer_normalize' ) );~~
50	49
51	50	/**
52	51	* Unicode normalization routines for working with UTF-8 strings.
—	—	@@ -80,7 +79,7 @@
81	80	return $ret;
82	81	}
83	82
84		~~- if( NORMALIZE_ICU \|\| NORMALIZE_INTL ) {~~
	83	+ if( NORMALIZE_ICU ) {
85	84	# We exclude a few chars that ICU would not.
86	85	$string = preg_replace(
87	86	'/[\x00-\x08\x0b\x0c\x0e-\x1f]/',
—	—	@@ -91,8 +90,7 @@
92	91
93	92	# UnicodeString constructor fails if the string ends with a
94	93	# head byte. Add a junk char at the end, we'll strip it off.
95		~~- if ( NORMALIZE_ICU ) return rtrim( utf8_normalize( $string . "\x01", UNORM_NFC ), "\x01" );~~
96		~~- if ( NORMALIZE_INTL ) return normalizer_normalize( $string, Normalizer::FORM_C );~~
	94	+ return rtrim( utf8_normalize( $string . "\x01", UNORM_NFC ), "\x01" );
97	95	} elseif( UtfNormal::quickIsNFCVerify( $string ) ) {
98	96	# Side effect -- $string has had UTF-8 errors cleaned up.
99	97	return $string;
—	—	@@ -110,9 +108,7 @@
111	109	* @return string a UTF-8 string in normal form C
112	110	*/
113	111	static function toNFC( $string ) {
114		~~- if( NORMALIZE_INTL )~~
115		~~- return normalizer_normalize( $string, Normalizer::FORM_C );~~
116		~~- elseif( NORMALIZE_ICU )~~
	112	+ if( NORMALIZE_ICU )
117	113	return utf8_normalize( $string, UNORM_NFC );
118	114	elseif( UtfNormal::quickIsNFC( $string ) )
119	115	return $string;
—	—	@@ -128,9 +124,7 @@
129	125	* @return string a UTF-8 string in normal form D
130	126	*/
131	127	static function toNFD( $string ) {
132		~~- if( NORMALIZE_INTL )~~
133		~~- return normalizer_normalize( $string, Normalizer::FORM_D );~~
134		~~- elseif( NORMALIZE_ICU )~~
	128	+ if( NORMALIZE_ICU )
135	129	return utf8_normalize( $string, UNORM_NFD );
136	130	elseif( preg_match( '/[\x80-\xff]/', $string ) )
137	131	return UtfNormal::NFD( $string );
—	—	@@ -147,9 +141,7 @@
148	142	* @return string a UTF-8 string in normal form KC
149	143	*/
150	144	static function toNFKC( $string ) {
151		~~- if( NORMALIZE_INTL )~~
152		~~- return normalizer_normalize( $string, Normalizer::FORM_KC );~~
153		~~- elseif( NORMALIZE_ICU )~~
	145	+ if( NORMALIZE_ICU )
154	146	return utf8_normalize( $string, UNORM_NFKC );
155	147	elseif( preg_match( '/[\x80-\xff]/', $string ) )
156	148	return UtfNormal::NFKC( $string );
—	—	@@ -166,9 +158,7 @@
167	159	* @return string a UTF-8 string in normal form KD
168	160	*/
169	161	static function toNFKD( $string ) {
170		~~- if( NORMALIZE_INTL )~~
171		~~- return normalizer_normalize( $string, Normalizer::FORM_KD );~~
172		~~- elseif( NORMALIZE_ICU )~~
	162	+ if( NORMALIZE_ICU )
173	163	return utf8_normalize( $string, UNORM_NFKD );
174	164	elseif( preg_match( '/[\x80-\xff]/', $string ) )
175	165	return UtfNormal::NFKD( $string );

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r69620	Admin is required now.	mah	15:05, 20 July 2010

Status & tagging log

21:51, 21 July 2010 Simetrical (talk | contribs) changed the status of r69622 [removed: new added: ok]