| Index: branches/wmf/1.17wmf1/skins/vector/screen.css |
| — | — | @@ -969,8 +969,8 @@ |
| 970 | 970 | } |
| 971 | 971 | /* User Message */ |
| 972 | 972 | .usermessage { |
| 973 | | - background-color: #e0e8ff; |
| 974 | | - border: 1px solid #99b3ff; |
| | 973 | + background-color: #ffce7b; |
| | 974 | + border: 1px solid #ffa500; |
| 975 | 975 | color: black; |
| 976 | 976 | font-weight: bold; |
| 977 | 977 | margin: 2em 0 1em; |
| Property changes on: branches/wmf/1.17wmf1/skins/vector/screen.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 978 | 978 | Merged /trunk/phase3/skins/vector/screen.css:r82315,82386,82411-82413,82446 |
| Index: branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1744,7 +1744,7 @@ |
| 1745 | 1745 | $labelMsg = wfMsgExt( 'revreview-check-flag-u', 'parseinline' ); |
| 1746 | 1746 | } |
| 1747 | 1747 | $label = Xml::element( 'label', $attribs, $labelMsg ); |
| 1748 | | - $checkboxes['reviewed'] = $checkbox . ' ' . $label; |
| | 1748 | + $checkboxes['reviewed'] = $checkbox . ' ' . $label; |
| 1749 | 1749 | } |
| 1750 | 1750 | return true; |
| 1751 | 1751 | } |
| Index: branches/wmf/1.17wmf1/extensions/ProofreadPage/ProofreadPage_body.php |
| — | — | @@ -1525,7 +1525,7 @@ |
| 1526 | 1526 | $qe = $ne * 100 / $n; |
| 1527 | 1527 | $void_cell = $ne ? "<td align=center style='border-style:dotted;border-width:1px;' width=\"{$qe}\"></td>" : ''; |
| 1528 | 1528 | $output = "<table class=\"pr_quality\" style=\"line-height:40%;\" border=0 cellpadding=0 cellspacing=0 ><tr> |
| 1529 | | -<td align=center > </td> |
| | 1529 | +<td align=center > </td> |
| 1530 | 1530 | <td align=center class='quality4' width=\"$q4\"></td> |
| 1531 | 1531 | <td align=center class='quality3' width=\"$q3\"></td> |
| 1532 | 1532 | <td align=center class='quality2' width=\"$q2\"></td> |
| Index: branches/wmf/1.17wmf1/extensions/skins/p2wiki/P2wiki.skin.php |
| — | — | @@ -317,7 +317,7 @@ |
| 318 | 318 | <!-- /dataAfterContent --> |
| 319 | 319 | <?php endif; ?> |
| 320 | 320 | </div> |
| 321 | | - <div class="bottom_of_entry"> </div> |
| | 321 | + <div class="bottom_of_entry"> </div> |
| 322 | 322 | <div class="visualClear"></div> |
| 323 | 323 | </div> |
| 324 | 324 | |
| Index: branches/wmf/1.17wmf1/extensions/CentralAuth/ApiQueryGlobalUserInfo.php |
| — | — | @@ -42,37 +42,40 @@ |
| 43 | 43 | $params['user'] = $wgUser->getName(); |
| 44 | 44 | } |
| 45 | 45 | $user = new CentralAuthUser( $params['user'] ); |
| 46 | | - if ( !$user->exists() ) { |
| 47 | | - $this->dieUsageMsg( array( 'nosuchuser', $params['user'] ) ); |
| 48 | | - } |
| 49 | 46 | |
| 50 | 47 | // Add basic info |
| 51 | 48 | $result = $this->getResult(); |
| 52 | | - $data = array( |
| 53 | | - 'home' => $user->getHomeWiki(), |
| 54 | | - 'id' => $user->getId(), |
| 55 | | - 'registration' => wfTimestamp( TS_ISO_8601, $user->getRegistration() ) |
| 56 | | - ); |
| 57 | | - if ( $user->isLocked() ) { |
| 58 | | - $data['locked'] = ''; |
| | 49 | + $data = array(); |
| | 50 | + $userExists = $user->exists(); |
| | 51 | + |
| | 52 | + if ( $userExists ) { |
| | 53 | + $data['home'] = $user->getHomeWiki(); |
| | 54 | + $data['id'] = $user->getId(); |
| | 55 | + $data['registration'] = wfTimestamp( TS_ISO_8601, $user->getRegistration() ); |
| | 56 | + |
| | 57 | + if ( $user->isLocked() ) { |
| | 58 | + $data['locked'] = ''; |
| | 59 | + } |
| | 60 | + if ( $user->isHidden() ) { |
| | 61 | + $data['hidden'] = ''; |
| | 62 | + } |
| | 63 | + } else { |
| | 64 | + $data['missing'] = ''; |
| 59 | 65 | } |
| 60 | | - if ( $user->isHidden() ) { |
| 61 | | - $data['hidden'] = ''; |
| 62 | | - } |
| 63 | 66 | $result->addValue( 'query', $this->getModuleName(), $data ); |
| 64 | 67 | |
| 65 | 68 | // Add requested info |
| 66 | | - if ( isset( $prop['groups'] ) ) { |
| | 69 | + if ( $userExists && isset( $prop['groups'] ) ) { |
| 67 | 70 | $groups = $user->getGlobalGroups(); |
| 68 | 71 | $result->setIndexedTagName( $groups, 'g' ); |
| 69 | 72 | $result->addValue( array( 'query', $this->getModuleName() ), 'groups', $groups ); |
| 70 | 73 | } |
| 71 | | - if ( isset( $prop['rights'] ) ) { |
| | 74 | + if ( $userExists && isset( $prop['rights'] ) ) { |
| 72 | 75 | $rights = $user->getGlobalRights(); |
| 73 | 76 | $result->setIndexedTagName( $rights, 'r' ); |
| 74 | 77 | $result->addValue( array( 'query', $this->getModuleName() ), 'rights', $rights ); |
| 75 | 78 | } |
| 76 | | - if ( isset( $prop['merged'] ) ) { |
| | 79 | + if ( $userExists && isset( $prop['merged'] ) ) { |
| 77 | 80 | $accounts = $user->queryAttached(); |
| 78 | 81 | foreach ( $accounts as $account ) { |
| 79 | 82 | $a = array( |
| — | — | @@ -152,12 +155,6 @@ |
| 153 | 156 | return 'Show information about a global user.'; |
| 154 | 157 | } |
| 155 | 158 | |
| 156 | | - public function getPossibleErrors() { |
| 157 | | - return array_merge( parent::getPossibleErrors(), array( |
| 158 | | - array( 'nosuchuser', 'user' ), |
| 159 | | - ) ); |
| 160 | | - } |
| 161 | | - |
| 162 | 159 | protected function getExamples() { |
| 163 | 160 | return array( |
| 164 | 161 | 'api.php?action=query&meta=globaluserinfo', |
| Index: branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialCentralAuth.php |
| — | — | @@ -258,9 +258,9 @@ |
| 259 | 259 | if ( $span < 2 * $chunk ) { |
| 260 | 260 | return wfMsgExt( "centralauth-$unit-ago", 'parsemag', $wgLang->formatNum( $span ) ); |
| 261 | 261 | } |
| 262 | | - $span = $wgLang->formatNum( intval( $span / $chunk ) ); |
| | 262 | + $span = intval( $span / $chunk ); |
| 263 | 263 | } |
| 264 | | - return wfMsgExt( "centralauth-$unit-ago", 'parsemag', $span ); |
| | 264 | + return wfMsgExt( "centralauth-$unit-ago", 'parsemag', $wgLang->formatNum( $span ) ); |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | function showInfo() { |
| Index: branches/wmf/1.17wmf1/includes/specials/SpecialListfiles.php |
| — | — | @@ -211,10 +211,8 @@ |
| 212 | 212 | ) ); |
| 213 | 213 | $s = Html::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-listfiles-form' ) ) . |
| 214 | 214 | Xml::fieldset( wfMsg( 'listfiles' ) ) . |
| 215 | | - Html::openElement( 'table', array( 'id' => 'mw-listfiles-table' ) ) . |
| 216 | 215 | Xml::buildForm( $inputForm, 'table_pager_limit_submit' ) . |
| 217 | 216 | $this->getHiddenFields( array( 'limit', 'ilsearch', 'user' ) ) . |
| 218 | | - Html::closeElement( 'table' ) . |
| 219 | 217 | Html::closeElement( 'fieldset' ) . |
| 220 | 218 | Html::closeElement( 'form' ) . "\n"; |
| 221 | 219 | return $s; |