Completed
Pull Request — master (#38)
by Tom
02:12
created
Pivot.skin.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 			'useAddThisFollow' => ''
31 31
 		);
32 32
 		foreach ($wgPivotFeaturesDefaults as $fgOption => $fgOptionValue) {
33
-			if ( !isset($wgPivotFeatures[$fgOption]) ) {
33
+			if ( ! isset($wgPivotFeatures[$fgOption])) {
34 34
 				$wgPivotFeatures[$fgOption] = $fgOptionValue;
35 35
 			}
36 36
 		}
@@ -118,10 +118,10 @@  discard block
 block discarded – undo
118 118
       					<ul class="off-canvas-list">
119 119
 						
120 120
 								<li class="has-form">
121
-									<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
121
+									<form action="<?php $this->text('wgScript'); ?>" id="searchform" class="mw-search">
122 122
 										<div class="row collapse">
123 123
 											<div class="small-12 columns">
124
-												<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
124
+												<input type="search" name="search" placeholder="<?php echo wfMessage('search')->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
125 125
 											</div>
126 126
 										</div>
127 127
 									</form>
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
 						<?php foreach ($this->getPersonalTools() as $key => $item) { echo $this->makeListItem($key, $item); } ?>
139 139
 							<?php else: ?>
140 140
 								<?php if (isset($this->data['personal_urls']['anonlogin'])): ?>
141
-									<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
141
+									<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage('login')->text() ?></a></li>
142 142
 								<?php elseif (isset($this->data['personal_urls']['login'])): ?>
143
-									<li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
143
+									<li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage('login')->text() ?></a></li>
144 144
 										<?php else: ?>
145
-											<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text()); ?></li>
145
+											<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage('login')->text()); ?></li>
146 146
 								<?php endif; ?>
147 147
 							<?php endif; ?>
148 148
 					  </ul>
@@ -163,10 +163,10 @@  discard block
 block discarded – undo
163 163
 												<img alt="<?php echo $this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>" style="max-width: 100%;height: auto;display: inline-block; vertical-align: middle;"></a>		
164 164
 											</li>
165 165
 											<li class="has-form">
166
-												<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
166
+												<form action="<?php $this->text('wgScript'); ?>" id="searchform" class="mw-search">
167 167
 													<div class="row collapse">
168 168
 														<div class="small-12 columns">
169
-															<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
169
+															<input type="search" name="search" placeholder="<?php echo wfMessage('search')->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
170 170
 														</div>
171 171
 													</div>
172 172
 												</form>
@@ -191,25 +191,25 @@  discard block
 block discarded – undo
191 191
 												</div>
192 192
 												<?php endif; ?>
193 193
 												<!--[if lt IE 9]>
194
-												<div id="siteNotice" class="sitenotice"><?php echo $this->text('sitename') . ' '. wfMessage( 'pivot-browsermsg' )->text(); ?></div>
194
+												<div id="siteNotice" class="sitenotice"><?php echo $this->text('sitename').' '.wfMessage('pivot-browsermsg')->text(); ?></div>
195 195
 												<![endif]-->
196 196
 
197
-												<?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice" class="sitenotice"><?php $this->html( 'sitenotice' ); ?></div><?php } ?>
198
-												<?php if ( $this->data['newtalk'] ) { ?><div id="usermessage" class="newtalk"><?php $this->html( 'newtalk' ); ?></div><?php } ?>
197
+												<?php if ($this->data['sitenotice']) { ?><div id="siteNotice" class="sitenotice"><?php $this->html('sitenotice'); ?></div><?php } ?>
198
+												<?php if ($this->data['newtalk']) { ?><div id="usermessage" class="newtalk"><?php $this->html('newtalk'); ?></div><?php } ?>
199 199
 										</div>
200 200
 									</div>
201 201
 								
202 202
 									<?php if ($wgUser->isLoggedIn() || $wgPivotFeatures['showActionsForAnon']): ?>
203
-										<a href="#" data-options="align:left" data-dropdown="drop1" class="button secondary small radius pull-right hide-for-print" id="drop"><i class="fa fa-navicon fa-lg"><span id="page-actions" class="show-for-medium-up">&nbsp;<?php echo wfMessage( 'actions' )->text() ?></span></i></a>
203
+										<a href="#" data-options="align:left" data-dropdown="drop1" class="button secondary small radius pull-right hide-for-print" id="drop"><i class="fa fa-navicon fa-lg"><span id="page-actions" class="show-for-medium-up">&nbsp;<?php echo wfMessage('actions')->text() ?></span></i></a>
204 204
 										<ul id="drop1" class="tiny content f-dropdown" data-dropdown-content>
205
-											<?php foreach($this->data['content_actions'] as $key => $tab) { echo preg_replace(array('/\sprimary="1"/', '/\scontext="[a-z]+"/', '/\srel="archives"/'),'',$this->makeListItem($key, $tab)); } ?>
206
-											<?php wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ));  ?>
205
+											<?php foreach ($this->data['content_actions'] as $key => $tab) { echo preg_replace(array('/\sprimary="1"/', '/\scontext="[a-z]+"/', '/\srel="archives"/'), '', $this->makeListItem($key, $tab)); } ?>
206
+											<?php wfRunHooks('SkinTemplateToolboxEnd', array(&$this, true)); ?>
207 207
 										</ul>
208 208
 
209 209
 									<?php endif;
210 210
 									$namespace = str_replace('_', ' ', $this->getSkin()->getTitle()->getNsText());
211 211
 									$displaytitle = $this->data['title'];
212
-									if (!empty($namespace)) {
212
+									if ( ! empty($namespace)) {
213 213
 										$pagetitle = $this->getSkin()->getTitle();
214 214
 										$newtitle = str_replace($namespace.':', '', $pagetitle);
215 215
 										$displaytitle = str_replace($pagetitle, $newtitle, $displaytitle);
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 											<div class="<?php echo $wgPivotFeatures['useAddThisShare']; ?> hide-for-print"></div>
222 222
 											<!-- Go to www.addthis.com/dashboard to customize your tools -->
223 223
 											<?php } ?>
224
-									<?php if ( $this->data['isarticle'] ) { ?><h3 id="tagline"><?php $this->msg( 'tagline' ) ?></h3><?php } ?>
224
+									<?php if ($this->data['isarticle']) { ?><h3 id="tagline"><?php $this->msg('tagline') ?></h3><?php } ?>
225 225
 									<h5 id="sitesub" class="subtitle"><?php $this->html('subtitle') ?></h5>
226 226
 									<div id="contentSub" class="clear_both"></div>
227 227
 									<div id="bodyContent" class="mw-bodytext">
@@ -304,10 +304,10 @@  discard block
 block discarded – undo
304 304
 	function renderSidebar() { 
305 305
 		$sidebar = $this->getSidebar();
306 306
 		$toolbox = $this->getToolbox();
307
-		foreach ($sidebar as $boxName => $box) { if ( ($box['header'] != wfMessage( 'toolbox' )->text()) ) { 
308
-			echo '<li id='.Sanitizer::escapeId( $box['id'] ); Linker::tooltip( $box['id'] ).'>';
309
-			echo '<li><label>'.htmlspecialchars( $box['header'] ).'</label></li>';
310
-					if ( is_array( $box['content'] ) ) {
307
+		foreach ($sidebar as $boxName => $box) { if (($box['header'] != wfMessage('toolbox')->text())) { 
308
+			echo '<li id='.Sanitizer::escapeId($box['id']); Linker::tooltip($box['id']).'>';
309
+			echo '<li><label>'.htmlspecialchars($box['header']).'</label></li>';
310
+					if (is_array($box['content'])) {
311 311
 							foreach ($box['content'] as $key => $item) { echo $this->makeListItem($key, $item); }
312 312
 								} }
313 313
 									}
Please login to merge, or discard this patch.