r46429 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r46428‎ | r46429 | r46430 >
Date:06:20, 28 January 2009
Author:aaron
Status:ok (Comments)
Tags:
Comment:
(bug 17186) Fixed incorrect stub link classing at user contribs
Modified paths:
  • /trunk/phase3/includes/specials/SpecialContributions.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialPreferences.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/specials/SpecialPreferences.php
@@ -893,19 +893,17 @@
894894 $mplink = htmlspecialchars( $mptitle->getLocalURL( "useskin=$skinkey" ) );
895895 $previewlink = "(<a target='_blank' href=\"$mplink\">$previewtext</a>)";
896896 $extraLinks = '';
897 - if( $skinkey == $this->mSkin ) {
898 - global $wgAllowUserCss, $wgAllowUserJs;
899 - if( $wgAllowUserCss ) {
900 - $cssPage = Title::makeTitleSafe( NS_USER, $wgUser->getName().'/'.$skinkey.'.css' );
901 - $customCSS = $sk->makeLinkObj( $cssPage, wfMsgExt('prefs-custom-css', array() ) );
902 - $extraLinks .= " ($customCSS)";
903 - }
904 - if( $wgAllowUserJs ) {
905 - $jsPage = Title::makeTitleSafe( NS_USER, $wgUser->getName().'/'.$skinkey.'.js' );
906 - $customJS = $sk->makeLinkObj( $jsPage, wfMsgHtml('prefs-custom-js') );
907 - $extraLinks .= " ($customJS)";
908 - }
 897+ global $wgAllowUserCss, $wgAllowUserJs;
 898+ if( $wgAllowUserCss ) {
 899+ $cssPage = Title::makeTitleSafe( NS_USER, $wgUser->getName().'/'.$skinkey.'.css' );
 900+ $customCSS = $sk->makeLinkObj( $cssPage, wfMsgExt('prefs-custom-css', array() ) );
 901+ $extraLinks .= " ($customCSS)";
909902 }
 903+ if( $wgAllowUserJs ) {
 904+ $jsPage = Title::makeTitleSafe( NS_USER, $wgUser->getName().'/'.$skinkey.'.js' );
 905+ $customJS = $sk->makeLinkObj( $jsPage, wfMsgHtml('prefs-custom-js') );
 906+ $extraLinks .= " ($customJS)";
 907+ }
910908 if( $skinkey == $wgDefaultSkin )
911909 $sn .= ' (' . wfMsg( 'default' ) . ')';
912910 $wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked />
Index: trunk/phase3/includes/specials/SpecialContributions.php
@@ -397,8 +397,8 @@
398398 'tables' => $tables,
399399 'fields' => array(
400400 'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'page_is_redirect',
401 - 'rev_id', 'rev_page','rev_text_id', 'rev_timestamp', 'rev_comment', 'rev_minor_edit',
402 - 'rev_user', 'rev_user_text', 'rev_parent_id', 'rev_deleted'
 401+ 'page_len','rev_id', 'rev_page', 'rev_text_id', 'rev_timestamp', 'rev_comment',
 402+ 'rev_minor_edit', 'rev_user', 'rev_user_text', 'rev_parent_id', 'rev_deleted'
403403 ),
404404 'conds' => $conds,
405405 'options' => array( 'USE INDEX' => array('revision' => $index) ),

Comments

#Comment by Aaron Schulz (talk | contribs)   06:22, 28 January 2009

Didn't mean to commit SpecialPreferences.php, sigh...

#Comment by Aaron Schulz (talk | contribs)   16:09, 29 January 2009

Letting it stay though :)

Status & tagging log