| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1036,32 +1036,6 @@ |
| 1037 | 1037 | if( $iw && $wgInterwikiMagic && $nottalk && $wgLang->getLanguageName( $iw ) ) { |
| 1038 | 1038 | array_push( $this->mLanguageLinks, $nt->getPrefixedText() ); |
| 1039 | 1039 | $s .= $trail; |
| 1040 | | -/* CHECK MERGE @@@ |
| 1041 | | - } else if ( "media" == $pre ) { |
| 1042 | | - $nt = Title::newFromText( $suf ); |
| 1043 | | - $name = $nt->getDBkey(); |
| 1044 | | - if ( "" == $text ) { $text = $nt->GetText(); } |
| 1045 | | - |
| 1046 | | - $wgLinkCache->addImageLink( $name ); |
| 1047 | | - $s .= $sk->makeMediaLink( $name, |
| 1048 | | - wfImageUrl( $name ), $text ); |
| 1049 | | - $s .= $trail; |
| 1050 | | - } else if ( isset($wgUseCategoryMagic) && $wgUseCategoryMagic && $pre == wfMsg ( "category" ) ) { |
| 1051 | | - $l = $sk->makeLink ( $pre.":".ucfirst( $m[2] ), ucfirst ( $m[2] ) ) ; |
| 1052 | | - array_push ( $this->mCategoryLinks , $l ) ; |
| 1053 | | - $s .= $trail ; |
| 1054 | | - } else { |
| 1055 | | - $l = $wgLang->getLanguageName( $pre ); |
| 1056 | | - if ( "" == $l or !$wgInterwikiMagic or Namespace::isTalk( $wgTitle->getNamespace() ) ) { |
| 1057 | | - if ( "" == $text ) { |
| 1058 | | - $text = $link; |
| 1059 | | - } |
| 1060 | | - $s .= $sk->makeLink( $link, $text, "", $trail ); |
| 1061 | | - } else if ( $pre != $wgLanguageCode ) { |
| 1062 | | - array_push( $this->mLanguageLinks, "$pre:$suf" ); |
| 1063 | | - $s .= $trail; |
| 1064 | | - } |
| 1065 | | -*/ |
| 1066 | 1040 | continue; |
| 1067 | 1041 | } |
| 1068 | 1042 | if( $ns == $image ) { |
| — | — | @@ -1069,15 +1043,6 @@ |
| 1070 | 1044 | $wgLinkCache->addImageLinkObj( $nt ); |
| 1071 | 1045 | continue; |
| 1072 | 1046 | } |
| 1073 | | -/* CHECK MERGE @@@ |
| 1074 | | -# } else if ( 0 == strcmp( "##", substr( $link, 0, 2 ) ) ) { |
| 1075 | | -# $link = substr( $link, 2 ); |
| 1076 | | -# $s .= "<a name=\"{$link}\">{$text}</a>{$trail}"; |
| 1077 | | - } else { |
| 1078 | | - if ( "" == $text ) { $text = $link; } |
| 1079 | | - # Hotspot: |
| 1080 | | - $s .= $sk->makeLink( $link, $text, "", $trail ); |
| 1081 | | -*/ |
| 1082 | 1047 | } |
| 1083 | 1048 | if( $ns == $media ) { |
| 1084 | 1049 | $s .= $sk->makeMediaLinkObj( $nt, $text ) . $trail; |