r98452 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r98451‎ \| r98452 \| r98453 >
Date:	21:10, 29 September 2011
Author:	reedy
Status:	ok
Tags:
Comment:	1.18: MFT r97403, r97614, r97657, r97661
Modified paths:	/branches/REL1_18/phase3/RELEASE-NOTES-1.18 (modified) (history) /branches/REL1_18/phase3/includes/SkinLegacy.php (modified) (history) /branches/REL1_18/phase3/includes/profiler/ProfilerSimple.php (modified) (history) /branches/REL1_18/phase3/includes/specials/SpecialPrefixindex.php (modified) (history) /branches/REL1_18/phase3/resources/mediawiki.special/mediawiki.special.css (modified) (history) /branches/REL1_18/phase3/skins/CologneBlue.php (modified) (history) /branches/REL1_18/phase3/skins/Standard.php (modified) (history) /branches/REL1_18/phase3/skins/monobook/IE60Fixes.css (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/skins/monobook/IE60Fixes.css
—	—	@@ -11,17 +11,34 @@
12	12	margin-top: 3em;
13	13	height: 1%;
14	14	}
	15	+.rtl div#column-content div#content {
	16	+ margin-right: 12.2em;
	17	+ margin-left: 0;
	18	+}
15	19	div#column-one {
16	20	position: absolute;
17	21	top: 0;
18	22	left: 0;
19	23	z-index: 4;
20	24	}
	25	+.rtl div#column-one {
	26	+ left: auto;
	27	+ right: 0;
	28	+}
21	29	div#footer {
22	30	margin-left: 13.6em;
23	31	border-left: 1px solid #fabd23;
24	32	}
	33	+.rtl div#footer {
	34	+ margin-left: 0;
	35	+ margin-right: 13.6em;
	36	+ border-left: none;
	37	+ border-right: 1px solid #fabd23;
	38	+}
25	39
	40	+ /* the tabs */
	41	+
	42	+
26	43	/* the tabs */
27	44
28	45	#p-cactions {
Index: branches/REL1_18/phase3/skins/CologneBlue.php
—	—	@@ -29,19 +29,23 @@
30	30	if ( 2 == $qb ) { # Right
31	31	$rules[] = "/* @noflip */#quickbar { position: absolute; right: 4px; }";
32	32	$rules[] = "/* @noflip */#article { margin-left: 4px; margin-right: 148px; }";
	33	+ $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }";
33	34	} elseif ( 1 == $qb ) {
34	35	$rules[] = "/* @noflip */#quickbar { position: absolute; left: 4px; }";
35	36	$rules[] = "/* @noflip */#article { margin-left: 148px; margin-right: 4px; }";
	37	+ $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }";
36	38	} elseif ( 3 == $qb ) { # Floating left
37	39	$rules[] = "/* @noflip */#quickbar { position:absolute; left:4px }";
38	40	$rules[] = "/* @noflip */#topbar { margin-left: 148px }";
39	41	$rules[] = "/* @noflip */#article { margin-left:148px; margin-right: 4px; }";
40	42	$rules[] = "/* @noflip */body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto; bottom:4px;}"; # Hides from IE
	43	+ $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }";
41	44	} elseif ( 4 == $qb ) { # Floating right
42	45	$rules[] = "/* @noflip */#quickbar { position: fixed; right: 4px; }";
43	46	$rules[] = "/* @noflip */#topbar { margin-right: 148px }";
44	47	$rules[] = "/* @noflip */#article { margin-right: 148px; margin-left: 4px; }";
45	48	$rules[] = "/* @noflip */body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto; bottom:4px;}"; # Hides from IE
	49	+ $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }";
46	50	}
47	51	$style = implode( "\n", $rules );
48	52	$out->addInlineStyle( $style, 'flip' );
—	—	@@ -99,10 +103,6 @@
100	104	$s .= "\n<div id='footer'>";
101	105	$s .= '<table width="98%" border="0" cellspacing="0"><tr>';
102	106
103		~~- $qb = $this->getSkin()->qbSetting();~~
104		~~- if ( 1 == $qb \|\| 3 == $qb ) { # Left~~
105		~~- $s .= $this->getQuickbarCompensator();~~
106		~~- }~~
107	107	$s .= '<td class="bottom">';
108	108
109	109	$s .= $this->bottomLinks();
—	—	@@ -121,12 +121,9 @@
122	122	$s .= "\n<br />" . $this->pageStats();
123	123
124	124	$s .= '</td>';
125		~~- if ( 2 == $qb ) { # Right~~
126		~~- $s .= $this->getQuickbarCompensator();~~
127		~~- }~~
128	125	$s .= "</tr></table>\n</div>\n</div>\n";
129	126
130		~~- if ( 0 != $qb ) {~~
	127	+ if ( $this->getSkin()->qbSetting() != 0 ) {
131	128	$s .= $this->quickBar();
132	129	}
133	130	return $s;
Index: branches/REL1_18/phase3/skins/Standard.php
—	—	@@ -28,9 +28,11 @@
29	29	if ( 2 == $qb ) { # Right
30	30	$rules[] = "/* @noflip */#quickbar { position: absolute; top: 4px; right: 4px; border-left: 2px solid #000000; }";
31	31	$rules[] = "/* @noflip */#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }";
	32	+ $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }";
32	33	} elseif ( 1 == $qb \|\| 3 == $qb ) {
33	34	$rules[] = "/* @noflip */#quickbar { position: absolute; top: 4px; left: 4px; border-right: 1px solid gray; }";
34	35	$rules[] = "/* @noflip */#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }";
	36	+ $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }";
35	37	if( 3 == $qb ) {
36	38	$rules[] = "/* @noflip */#quickbar { position: fixed; padding: 4px; }";
37	39	}
—	—	@@ -38,6 +40,7 @@
39	41	$rules[] = "/* @noflip */#quickbar { position: fixed; right: 0px; top: 0px; padding: 4px;}";
40	42	$rules[] = "/* @noflip */#quickbar { border-right: 1px solid gray; }";
41	43	$rules[] = "/* @noflip */#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }";
	44	+ $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }";
42	45	}
43	46	$style = implode( "\n", $rules );
44	47	$out->addInlineStyle( $style, 'flip' );
—	—	@@ -58,17 +61,7 @@
59	62
60	63	wfProfileOut( __METHOD__ . '-1' );
61	64	wfProfileIn( __METHOD__ . '-2' );
62		-
63		~~- $qb = $this->getSkin()->qbSetting();~~
64		~~- $shove = ( $qb != 0 );~~
65		~~- $left = ( $qb == 1 \|\| $qb == 3 );~~
66		-
67		~~- if ( $shove && $left ) { # Left~~
68		~~- $s .= $this->getQuickbarCompensator();~~
69		~~- }~~
70		~~- wfProfileOut( __METHOD__ . '-2' );~~
71		~~- wfProfileIn( __METHOD__ . '-3' );~~
72		~~- $l = $wgContLang->alignStart();~~
	65	+ $l = $this->getSkin()->getLang()->alignStart();
73	66	$s .= "<td class='bottom' align='$l' valign='top'>";
74	67
75	68	$s .= $this->bottomLinks();
—	—	@@ -80,17 +73,14 @@
81	74	. '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
82	75
83	76	$s .= '</td>';
84		~~- if ( $shove && !$left ) { # Right~~
85		~~- $s .= $this->getQuickbarCompensator();~~
86		~~- }~~
87	77	$s .= "</tr></table>\n</div>\n</div>\n";
88	78
89		~~- wfProfileOut( __METHOD__ . '-3' );~~
90		~~- wfProfileIn( __METHOD__ . '-4' );~~
91		~~- if ( 0 != $qb ) {~~
	79	+ wfProfileOut( __METHOD__ . '-2' );
	80	+ wfProfileIn( __METHOD__ . '-3' );
	81	+ if ( $this->getSkin()->qbSetting() != 0 ) {
92	82	$s .= $this->quickBar();
93	83	}
94		~~- wfProfileOut( __METHOD__ . '-4' );~~
	84	+ wfProfileOut( __METHOD__ . '-3' );
95	85	wfProfileOut( __METHOD__ );
96	86	return $s;
97	87	}
Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18
—	—	@@ -456,6 +456,8 @@
457	457	space (U+20) will sort under an invisible header like in 1.16 rather than a U+6DE
458	458	* (bug 30497) Add client-nojs and client-js classes on document element
459	459	to let styles easily hide or show things based on general JS availability
	460	+* (bug 18424) Special:Prefixindex and Special:Allpages paging links are
	461	+ really small, and somewhat inconsistent with each other.
460	462
461	463	=== API changes in 1.18 ===
462	464	* BREAKING CHANGE: action=watch now requires POST and token.
Property changes on: branches/REL1_18/phase3/RELEASE-NOTES-1.18
___________________________________________________________________
Modified: svn:mergeinfo
463	465	Merged /trunk/phase3/RELEASE-NOTES-1.18:r97403,97614,97657,97661
Index: branches/REL1_18/phase3/includes/profiler/ProfilerSimple.php
—	—	@@ -12,10 +12,20 @@
13	13	class ProfilerSimple extends Profiler {
14	14	var $mMinimumTime = 0;
15	15
	16	+ var $zeroEntry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);
	17	+ var $errorEntry;
	18	+
16	19	function __construct( $params ) {
17	20	global $wgRequestTime, $wgRUstart;
18	21	parent::__construct( $params );
	22	+
	23	+ $this->errorEntry = $this->zeroEntry;
	24	+ $this->errorEntry['count'] = 1;
	25	+
19	26	if (!empty($wgRequestTime) && !empty($wgRUstart)) {
	27	+ # Remove the -total entry from parent::__construct
	28	+ $this->mWorkStack = array();
	29	+
20	30	$this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
21	31
22	32	$elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
—	—	@@ -23,7 +33,7 @@
24	34
25	35	$entry =& $this->mCollated["-setup"];
26	36	if (!is_array($entry)) {
27		~~- $entry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);~~
	37	+ $entry = $this->zeroEntry;
28	38	$this->mCollated["-setup"] =& $entry;
29	39	}
30	40	$entry['cpu'] += $elapsedcpu;
—	—	@@ -62,20 +72,18 @@
63	73	$message = "Profile section ended by close(): {$ofname}";
64	74	$functionname = $ofname;
65	75	$this->debug( "$message\n" );
66		~~- $this->mCollated[$message] = array(~~
67		~~- 'real' => 0.0, 'count' => 1);~~
	76	+ $this->mCollated[$message] = $this->errorEntry;
68	77	}
69	78	elseif ($ofname != $functionname) {
70	79	$message = "Profiling error: in({$ofname}), out($functionname)";
71	80	$this->debug( "$message\n" );
72		~~- $this->mCollated[$message] = array(~~
73		~~- 'real' => 0.0, 'count' => 1);~~
	81	+ $this->mCollated[$message] = $this->errorEntry;
74	82	}
75	83	$entry =& $this->mCollated[$functionname];
76	84	$elapsedcpu = $this->getCpuTime() - $octime;
77	85	$elapsedreal = microtime(true) - $ortime;
78	86	if (!is_array($entry)) {
79		~~- $entry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);~~
	87	+ $entry = $this->zeroEntry;
80	88	$this->mCollated[$functionname] =& $entry;
81	89	}
82	90	$entry['cpu'] += $elapsedcpu;
Index: branches/REL1_18/phase3/includes/SkinLegacy.php
—	—	@@ -90,11 +90,10 @@
91	91	}
92	92
93	93	function doBeforeContent() {
94		~~- global $wgContLang;~~
	94	+ global $wgLang;
95	95	wfProfileIn( __METHOD__ );
96	96
97	97	$s = '';
98		~~- $qb = $this->getSkin()->qbSetting();~~
99	98
100	99	$langlinks = $this->otherLanguages();
101	100	if ( $langlinks ) {
—	—	@@ -107,25 +106,20 @@
108	107	}
109	108
110	109	$s .= "\n<div id='content'>\n<div id='topbar'>\n" .
111		~~- "<table border='0' cellspacing='0' width='98%'>\n<tr>\n";~~
	110	+ "<table border='0' cellspacing='0' width='100%'>\n<tr>\n";
112	111
113		~~- $shove = ( $qb != 0 );~~
114		~~- $left = ( $qb == 1 \|\| $qb == 3 );~~
115		-
116		~~- if ( !$shove ) {~~
	112	+ if ( $this->getSkin()->qbSetting() == 0 ) {
117	113	$s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
118		~~- $this->getSkin()->logoText() . '</td>';~~
119		~~- } elseif ( $left ) {~~
120		~~- $s .= $this->getQuickbarCompensator( $rows );~~
	114	+ $this->getSkin()->logoText( $wgLang->alignStart() ) . '</td>';
121	115	}
122	116
123		~~- $l = $wgContLang->alignStart();~~
	117	+ $l = $wgLang->alignStart();
124	118	$s .= "<td {$borderhack} align='$l' valign='top'>\n";
125	119
126	120	$s .= $this->topLinks();
127	121	$s .= '<p class="subtitle">' . $this->pageTitleLinks() . "</p>\n";
128	122
129		~~- $r = $wgContLang->alignEnd();~~
	123	+ $r = $wgLang->alignEnd();
130	124	$s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
131	125	$s .= $this->nameAndLogin();
132	126	$s .= "\n<br />" . $this->searchForm() . '</td>';
—	—	@@ -134,10 +128,6 @@
135	129	$s .= "</tr>\n<tr>\n<td class='top' colspan=\"2\">$langlinks</td>\n";
136	130	}
137	131
138		~~- if ( $shove && !$left ) { # Right~~
139		~~- $s .= $this->getQuickbarCompensator( $rows );~~
140		~~- }~~
141		-
142	132	$s .= "</tr>\n</table>\n</div>\n";
143	133	$s .= "\n<div id='article'>\n";
144	134
—	—	@@ -593,6 +583,9 @@
594	584	return $wgLang->pipeList( $s );
595	585	}
596	586
	587	+ /**
	588	+ * @deprecated in 1.19
	589	+ */
597	590	function getQuickbarCompensator( $rows = 1 ) {
598	591	return "<td width='152' rowspan='{$rows}'> </td>";
599	592	}
Index: branches/REL1_18/phase3/includes/specials/SpecialPrefixindex.php
—	—	@@ -195,6 +195,7 @@
196	196	}
197	197	}
198	198
	199	+ $footer = '';
199	200	if ( $this->including() ) {
200	201	$out2 = '';
201	202	} else {
—	—	@@ -205,7 +206,7 @@
206	207	<td>' .
207	208	$nsForm .
208	209	'</td>
209		~~- <td id="mw-prefixindex-nav-form">';~~
	210	+ <td id="mw-prefixindex-nav-form" class="mw-prefixindex-nav">';
210	211
211	212	if( isset( $res ) && $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
212	213	$query = array(
—	—	@@ -217,20 +218,21 @@
218	219	$query['namespace'] = $namespace;
219	220	}
220	221
221		~~- $out2 = $wgLang->pipeList( array(~~
222		~~- $out2,~~
223		~~- $sk->linkKnown(~~
	222	+ $nextLink = Linker::linkKnown(
224	223	$self,
225	224	wfMsgHtml( 'nextpage', str_replace( '_',' ', htmlspecialchars( $s->page_title ) ) ),
226	225	array(),
227	226	$query
228		~~- )~~
229		~~- ) );~~
	227	+ );
	228	+ $out2 .= $nextLink;
	229	+
	230	+ $footer = "\n" . Html::element( "hr" )
	231	+ . Html::rawElement( "div", array( "class" => "mw-prefixindex-nav" ), $nextLink );
230	232	}
231	233	$out2 .= "</td></tr>" .
232	234	Xml::closeElement( 'table' );
233	235	}
234	236
235		~~- $wgOut->addHTML( $out2 . $out );~~
	237	+ $this->getOutput()->addHTML( $out2 . $out . $footer );
236	238	}
237	239	}
Index: branches/REL1_18/phase3/resources/mediawiki.special/mediawiki.special.css
—	—	@@ -25,7 +25,6 @@
26	26	}
27	27	.mw-allpages-nav {
28	28	text-align: right;
29		~~- font-size: smaller;~~
30	29	margin-bottom: 1em;
31	30	}
32	31	table.mw-allpages-table-form tr {
—	—	@@ -72,11 +71,12 @@
73	72	width: 98%;
74	73	}
75	74	td#mw-prefixindex-nav-form {
76		~~- font-size: smaller;~~
77	75	margin-bottom: 1em;
78		~~- text-align: right;~~
79	76	vertical-align: top;
80	77	}
	78	+.mw-prefixindex-nav {
	79	+ text-align: right;
	80	+}
81	81
82	82
83	83	/** Special:Search **/

Follow-up revisions

Revision	Commit summary	Author	Date
r98453	Followup r98452, move RELEASE-NOTES from r97403	reedy	21:11, 29 September 2011

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r97403	(bug 18424) Clean up paging links on Special:allpages and special:prefixindex....	bawolff	04:25, 18 September 2011
r97614	* Fixed notices issued from ProfilerSimpleUDP which were due to ProfilerSimpl...	tstarling	11:06, 20 September 2011
r97657	Fix support of legacy skins Standard & CologneBlue for user language directio...	robin	19:47, 20 September 2011
r97661	Fixed IE6 issues in RTL mode	tparscal	20:40, 20 September 2011

Status & tagging log

00:43, 3 November 2011 😂 (talk | contribs) changed the status of r98452 [removed: new added: ok]