| Index: trunk/phase3/skins/CologneBlue.php |
| — | — | @@ -216,12 +216,12 @@ |
| 217 | 217 | |
| 218 | 218 | $barnumber = 1; |
| 219 | 219 | foreach ( $bar as $heading => $browseLinks ) { |
| 220 | | - $heading_text = wfMsg ( $heading ); |
| 221 | 220 | if ( $barnumber > 1 ) { |
| 222 | | - if ( wfEmptyMsg( $heading, $heading_text ) ) { |
| | 221 | + $headingMsg = wfMessage( $heading ); |
| | 222 | + if ( $headingMsg->exists() ) { |
| | 223 | + $h = $headingMsg->text(); |
| | 224 | + } else { |
| 223 | 225 | $h = $heading; |
| 224 | | - } else { |
| 225 | | - $h = $heading_text; |
| 226 | 226 | } |
| 227 | 227 | $s .= "\n<h6>" . htmlspecialchars( $h ) . "</h6>"; |
| 228 | 228 | } |
| — | — | @@ -231,7 +231,7 @@ |
| 232 | 232 | htmlspecialchars( $link['text'] ) . '</a>' . $sep; |
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | | - $barnumber = $barnumber + 1; |
| | 235 | + $barnumber++; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | if ( $wgOut->isArticle() ) { |
| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -298,7 +298,7 @@ |
| 299 | 299 | } |
| 300 | 300 | ?> |
| 301 | 301 | <div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::tooltip( 'p-' . $name ) ?>> |
| 302 | | - <h5<?php $this->html( 'userlangattributes' ) ?>><?php $out = wfMsg( $msg ); if ( wfEmptyMsg( $msg ) ) echo htmlspecialchars( $msg ); else echo htmlspecialchars( $out ); ?></h5> |
| | 302 | + <h5<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj = wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg ); ?></h5> |
| 303 | 303 | <div class="body"> |
| 304 | 304 | <?php |
| 305 | 305 | if ( is_array( $content ) ): ?> |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -288,7 +288,7 @@ |
| 289 | 289 | echo ' ' . Html::openElement( 'div', $portletAttribs ); |
| 290 | 290 | ?> |
| 291 | 291 | |
| 292 | | - <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5> |
| | 292 | + <h5><?php $msg = wfMessage( $bar ); echo htmlspecialchars( $msg->exists() ? $msg->text() : $bar ); ?></h5> |
| 293 | 293 | <div class='pBody'> |
| 294 | 294 | <?php if ( is_array( $cont ) ) { ?> |
| 295 | 295 | <ul> |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -905,7 +905,7 @@ |
| 906 | 906 | ( $action == 'edit' || $action == 'submit' ) && |
| 907 | 907 | ( $section != 'new' ) |
| 908 | 908 | ); |
| 909 | | - $msgKey = $title->exists() || ( $title->getNamespace() == NS_MEDIAWIKI && !wfEmptyMsg( $title->getText() ) ) ? |
| | 909 | + $msgKey = $title->exists() || ( $title->getNamespace() == NS_MEDIAWIKI && $title->getDefaultMessageText() !== false ) ? |
| 910 | 910 | "edit" : "create"; |
| 911 | 911 | $content_navigation['views']['edit'] = array( |
| 912 | 912 | 'class' => ( $selected ? 'selected' : '' ) . $isTalkClass, |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1253,22 +1253,24 @@ |
| 1254 | 1254 | if ( strpos( $line, '|' ) !== false ) { // sanity check |
| 1255 | 1255 | $line = MessageCache::singleton()->transform( $line, false, null, $this->getTitle() ); |
| 1256 | 1256 | $line = array_map( 'trim', explode( '|', $line, 2 ) ); |
| 1257 | | - $link = wfMsgForContent( $line[0] ); |
| 1258 | 1257 | |
| 1259 | | - if ( $link == '-' ) { |
| 1260 | | - continue; |
| | 1258 | + $msgLink = wfMessage( $line[0] )->inContentLanguage(); |
| | 1259 | + if ( $msgLink->exists() ) { |
| | 1260 | + $link = $msgLink->text(); |
| | 1261 | + if ( $link == '-' ) { |
| | 1262 | + continue; |
| | 1263 | + } |
| | 1264 | + } else { |
| | 1265 | + $link = $line[0]; |
| 1261 | 1266 | } |
| 1262 | 1267 | |
| 1263 | | - $text = wfMsgExt( $line[1], 'parsemag' ); |
| 1264 | | - |
| 1265 | | - if ( wfEmptyMsg( $line[1] ) ) { |
| | 1268 | + $msgText = wfMessage( $line[1] ); |
| | 1269 | + if ( $msgText->exists() ) { |
| | 1270 | + $text = $msgText->text(); |
| | 1271 | + } else { |
| 1266 | 1272 | $text = $line[1]; |
| 1267 | 1273 | } |
| 1268 | 1274 | |
| 1269 | | - if ( wfEmptyMsg( $line[0] ) ) { |
| 1270 | | - $link = $line[0]; |
| 1271 | | - } |
| 1272 | | - |
| 1273 | 1275 | if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) { |
| 1274 | 1276 | $href = $link; |
| 1275 | 1277 | } else { |