| Index: branches/REL1_18/extensions/OggHandler/OggHandler_body.php |
| — | — | @@ -26,7 +26,6 @@ |
| 27 | 27 | return true; |
| 28 | 28 | } |
| 29 | 29 | if ( $name == 'thumbtime' ) { |
| 30 | | - $length = $this->getLength( $image ); |
| 31 | 30 | $time = $this->parseTimeString( $value ); |
| 32 | 31 | if ( $time === false || $time <= 0 ) { |
| 33 | 32 | return false; |
| Property changes on: branches/REL1_18/extensions/OggHandler/OggHandler_body.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 34 | 33 | Merged /branches/wmf/1.18wmf1/extensions/OggHandler/OggHandler_body.php:r98207 |
| 35 | 34 | Merged /trunk/extensions/OggHandler/OggHandler_body.php:r98054,98110,98208,98278,98301 |
| Index: branches/REL1_18/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js |
| — | — | @@ -422,7 +422,7 @@ |
| 423 | 423 | var average = Math.round( ( rating.total / rating.count ) * 10 ) / 10; |
| 424 | 424 | $(this) |
| 425 | 425 | .find( '.articleFeedback-rating-average' ) |
| 426 | | - .text( average + ( average % 1 === 0 ? '.0' : '' ) ) |
| | 426 | + .text( mw.language.convertNumber( average + ( average % 1 === 0 ? '.0' : '' ) , false ) ) |
| 427 | 427 | .end() |
| 428 | 428 | .find( '.articleFeedback-rating-meter div' ) |
| 429 | 429 | .css( 'width', Math.round( average * 21 ) + 'px' ) |
| Index: branches/REL1_18/extensions/CheckUser/CheckUser_body.php |
| — | — | @@ -1041,7 +1041,7 @@ |
| 1042 | 1042 | # XFF string, link to /xff search |
| 1043 | 1043 | if ( $set[1] ) { |
| 1044 | 1044 | # Flag our trusted proxies |
| 1045 | | - list( $client, $trusted ) = efGetClientIPfromXFF( $set[1], $set[0] ); |
| | 1045 | + list( $client, $trusted ) = CheckUserHooks::getClientIPfromXFF( $set[1], $set[0] ); |
| 1046 | 1046 | $c = $trusted ? '#F0FFF0' : '#FFFFCC'; |
| 1047 | 1047 | $s .= '   <span style="background-color: ' . $c . '"><strong>XFF</strong>: '; |
| 1048 | 1048 | $s .= $this->sk->makeKnownLinkObj( $this->getTitle(), |
| — | — | @@ -1184,7 +1184,7 @@ |
| 1185 | 1185 | # XFF |
| 1186 | 1186 | if ( $row->cuc_xff != null ) { |
| 1187 | 1187 | # Flag our trusted proxies |
| 1188 | | - list( $client, $trusted ) = efGetClientIPfromXFF( $row->cuc_xff, $row->cuc_ip ); |
| | 1188 | + list( $client, $trusted ) = CheckUserHooks::getClientIPfromXFF( $row->cuc_xff, $row->cuc_ip ); |
| 1189 | 1189 | $c = $trusted ? '#F0FFF0' : '#FFFFCC'; |
| 1190 | 1190 | $line .= '   <span class="mw-checkuser-xff" style="background-color: ' . $c . '">' . |
| 1191 | 1191 | '<strong>XFF</strong>: '; |
| Index: branches/REL1_18/extensions/ParserFunctions/ParserFunctions_body.php |
| — | — | @@ -505,7 +505,7 @@ |
| 506 | 506 | return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_long' ) . '</strong>'; |
| 507 | 507 | } else { |
| 508 | 508 | if ( $ts < 100000000000000 ) { // Language can't deal with years after 9999 |
| 509 | | - if ( Language::isValidBuiltInCode( $language ) ) { |
| | 509 | + if ( $language !== '' && Language::isValidBuiltInCode( $language ) ) { |
| 510 | 510 | // use whatever language is passed as a parameter |
| 511 | 511 | $langObject = Language::factory( $language ); |
| 512 | 512 | $result = $langObject->sprintfDate( $format, $ts ); |