| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | * @access private |
| 47 | 47 | */ |
| 48 | 48 | function execute() { |
| 49 | | - global $wgUser, $wgVersion; |
| | 49 | + global $wgUser; |
| 50 | 50 | $skin = $wgUser->getSkin(); |
| 51 | 51 | |
| 52 | 52 | // Suppress warnings to prevent notices about missing indexes in $this->data |
| — | — | @@ -60,7 +60,6 @@ |
| 61 | 61 | <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" /> |
| 62 | 62 | <?php $this->html('headlinks') ?> |
| 63 | 63 | <title><?php $this->text('pagetitle') ?></title> |
| 64 | | - <meta name="generator" content="MediaWiki <?php echo $wgVersion ?>" /> |
| 65 | 64 | <style type="text/css" media="screen, projection">/*<![CDATA[*/ |
| 66 | 65 | @import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>"; |
| 67 | 66 | @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>"; |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -47,7 +47,7 @@ |
| 48 | 48 | * @access private |
| 49 | 49 | */ |
| 50 | 50 | function execute() { |
| 51 | | - global $wgUser, $wgVersion; |
| | 51 | + global $wgUser; |
| 52 | 52 | $skin = $wgUser->getSkin(); |
| 53 | 53 | |
| 54 | 54 | // Suppress warnings to prevent notices about missing indexes in $this->data |
| — | — | @@ -62,7 +62,6 @@ |
| 63 | 63 | <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" /> |
| 64 | 64 | <?php $this->html('headlinks') ?> |
| 65 | 65 | <title><?php $this->text('pagetitle') ?></title> |
| 66 | | - <meta name="generator" content="MediaWiki <?php echo $wgVersion ?>" /> |
| 67 | 66 | <?php if(empty($this->data['printable']) ) { ?> |
| 68 | 67 | <style type="text/css" media="screen, projection">/*<![CDATA[*/ |
| 69 | 68 | @import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>"; |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1333,7 +1333,7 @@ |
| 1334 | 1334 | public function headElement() { |
| 1335 | 1335 | global $wgDocType, $wgDTD, $wgContLanguageCode, $wgOutputEncoding, $wgMimeType; |
| 1336 | 1336 | global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces; |
| 1337 | | - global $wgUser, $wgContLang, $wgUseTrackbacks, $wgTitle, $wgStyleVersion, $wgVersion; |
| | 1337 | + global $wgUser, $wgContLang, $wgUseTrackbacks, $wgTitle, $wgStyleVersion; |
| 1338 | 1338 | |
| 1339 | 1339 | if( $wgMimeType == 'text/xml' || $wgMimeType == 'application/xhtml+xml' || $wgMimeType == 'application/xml' ) { |
| 1340 | 1340 | $ret = "<?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?>\n"; |
| — | — | @@ -1354,7 +1354,6 @@ |
| 1355 | 1355 | } |
| 1356 | 1356 | $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" $rtl>\n"; |
| 1357 | 1357 | $ret .= "<head>\n<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n"; |
| 1358 | | - $ret .= "<meta name=\"generator\" content=\"MediaWiki " . $wgVersion . "\" />\n"; |
| 1359 | 1358 | array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) ); |
| 1360 | 1359 | |
| 1361 | 1360 | $ret .= $this->getHeadLinks(); |
| — | — | @@ -1384,8 +1383,8 @@ |
| 1385 | 1384 | * @return string HTML tag links to be put in the header. |
| 1386 | 1385 | */ |
| 1387 | 1386 | public function getHeadLinks() { |
| 1388 | | - global $wgRequest, $wgFeed; |
| 1389 | | - $ret = ''; |
| | 1387 | + global $wgRequest, $wgFeed, $wgVersion; |
| | 1388 | + $ret = "<meta name=\"generator\" content=\"MediaWiki " . $wgVersion . "\" />\n"; |
| 1390 | 1389 | foreach ( $this->mMetatags as $tag ) { |
| 1391 | 1390 | if ( 0 == strcasecmp( 'http:', substr( $tag[0], 0, 5 ) ) ) { |
| 1392 | 1391 | $a = 'http-equiv'; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -172,6 +172,7 @@ |
| 173 | 173 | are in Special:Recentchanges |
| 174 | 174 | * Allow an $error message to be passed to ArticleDelete hook |
| 175 | 175 | * Allow extensions to modify the user creation form by calling addInputItem(); |
| | 176 | +* Add meta generator tag to HTML output |
| 176 | 177 | |
| 177 | 178 | === Bug fixes in 1.13 === |
| 178 | 179 | |