r69570 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r69569‎ | r69570 | r69571 >
Date:20:46, 19 July 2010
Author:catrope
Status:ok
Tags:
Comment:
Fix r69539: use $this->skin->stylename instead of $this->stylename, fix the path and access globals the right way
Modified paths:
  • /trunk/phase3/skins/Vector.php (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/Vector.php
@@ -771,7 +771,7 @@
772772 <?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?>
773773 <div id="simpleSearch">
774774 <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
775 - <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>><img src="<?php echo $wgStylePath . "/{$this->stylename}/search-" . ( $wgContLang->isRTL() ? 'rtl' : 'ltr' ) . '.png?' . $wgStyleVersion ?>" alt="<?php $this->msg( 'searchbutton' ) ?>" /></button>
 775+ <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>><img src="<?php echo $GLOBALS['wgStylePath'] . "/{$this->skin->stylename}/images/search-" . ( $GLOBALS['wgContLang']->isRTL() ? 'rtl' : 'ltr' ) . '.png?' . $GLOBALS['wgStyleVersion'] ?>" alt="<?php $this->msg( 'searchbutton' ) ?>" /></button>
776776 </div>
777777 <?php else: ?>
778778 <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />

Follow-up revisions

RevisionCommit summaryAuthorDate
r697291.16wmf4: Merge Vector fixes from trunk: r65063, r68798, r69335, r69336, r693...catrope14:09, 22 July 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r69539Follow up to r69538: Use $stylename member instead of hardcoding vector.danny_b10:58, 19 July 2010

Status & tagging log