| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -174,6 +174,11 @@ |
| 175 | 175 | </div></form> |
| 176 | 176 | </div> |
| 177 | 177 | </div> |
| | 178 | + <?php |
| | 179 | + if(isset($GLOBALS['wgSpecialPages']['Collection'])) { |
| | 180 | + Collection::printPortlet(); |
| | 181 | + } |
| | 182 | + ?> |
| 178 | 183 | <div class="portlet" id="p-tb"> |
| 179 | 184 | <h5><?php $this->msg('toolbox') ?></h5> |
| 180 | 185 | <div class="pBody"> |
| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -92,32 +92,30 @@ |
| 93 | 93 | * |
| 94 | 94 | * @param String $title |
| 95 | 95 | * @param String $action |
| 96 | | - * @param OutputPage $output |
| 97 | | - * @param WebRequest $request |
| 98 | | - * @param Language $lang |
| 99 | 96 | * @return Title object to be $wgTitle |
| 100 | 97 | */ |
| 101 | | - function checkInitialQueries( $title, $action, &$output, $request, $lang ) { |
| 102 | | - if( $request->getVal( 'printable' ) == 'yes' ){ |
| 103 | | - $output->setPrintable(); |
| | 98 | + function checkInitialQueries( $title, $action ) { |
| | 99 | + global $wgOut, $wgRequest, $wgContLang; |
| | 100 | + if( $wgRequest->getVal( 'printable' ) == 'yes' ){ |
| | 101 | + $wgOut->setPrintable(); |
| 104 | 102 | } |
| 105 | 103 | |
| 106 | 104 | $ret = NULL; |
| 107 | 105 | |
| 108 | 106 | if ( '' == $title && 'delete' != $action ) { |
| 109 | 107 | $ret = Title::newMainPage(); |
| 110 | | - } elseif ( $curid = $request->getInt( 'curid' ) ) { |
| | 108 | + } elseif ( $curid = $wgRequest->getInt( 'curid' ) ) { |
| 111 | 109 | # URLs like this are generated by RC, because rc_title isn't always accurate |
| 112 | 110 | $ret = Title::newFromID( $curid ); |
| 113 | 111 | } else { |
| 114 | 112 | $ret = Title::newFromURL( $title ); |
| 115 | 113 | // check variant links so that interwiki links don't have to worry |
| 116 | 114 | // about the possible different language variants |
| 117 | | - if( count( $lang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 ) |
| | 115 | + if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 ) |
| 118 | 116 | $lang->findVariantLink( $title, $ret ); |
| 119 | 117 | |
| 120 | 118 | } |
| 121 | | - if ( ( $oldid = $request->getInt( 'oldid' ) ) |
| | 119 | + if ( ( $oldid = $wgRequest->getInt( 'oldid' ) ) |
| 122 | 120 | && ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) ) { |
| 123 | 121 | // Allow oldid to override a changed or missing title. |
| 124 | 122 | $rev = Revision::newFromId( $oldid ); |
| Index: trunk/phase3/index.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | $action = $wgRequest->getVal( 'action', 'view' ); |
| 58 | 58 | $title = $wgRequest->getVal( 'title' ); |
| 59 | 59 | |
| 60 | | -$wgTitle = $mediaWiki->checkInitialQueries( $title, $action, $wgOut, $wgRequest, $wgContLang ); |
| | 60 | +$wgTitle = $mediaWiki->checkInitialQueries( $title, $action ); |
| 61 | 61 | if ($wgTitle == NULL) { |
| 62 | 62 | unset( $wgTitle ); |
| 63 | 63 | } |