r69539 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r69538‎ | r69539 | r69540 >
Date:10:58, 19 July 2010
Author:danny_b
Status:resolved (Comments)
Tags:
Comment:
Follow up to r69538: Use $stylename member instead of hardcoding vector.
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 . '/vector/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 $wgStylePath . "/{$this->stylename}/search-" . ( $wgContLang->isRTL() ? 'rtl' : 'ltr' ) . '.png?' . $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
r69570Fix r69539: use $this->skin->stylename instead of $this->stylename, fix the p...catrope20:46, 19 July 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r69538* (bug 24401) SimpleSearch: No button/text indicating 'Search' if image is di...danny_b10:52, 19 July 2010

Comments

#Comment by Raymond (talk | contribs)   16:19, 19 July 2010

Seen on twn:

PHP Notice: Undefined property: VectorTemplate::$stylename in /www/w/skins/Vector.php on line 774

#Comment by Catrope (talk | contribs)   16:20, 19 July 2010

Probably needs $this->skin->stylename

#Comment by Catrope (talk | contribs)   14:32, 22 July 2010

Merged in r69729, typoed revid in commit summary.

Status & tagging log