| Index: trunk/phase3/skins/Chick.php |
| — | — | @@ -23,6 +23,7 @@ |
| 24 | 24 | $this->skinname = 'chick'; |
| 25 | 25 | $this->stylename = 'chick'; |
| 26 | 26 | $this->template = 'MonoBookTemplate'; |
| | 27 | + $this->fixfiles = array( 'IE50', 'IE55', 'IE60' ); |
| 27 | 28 | } |
| 28 | 29 | } |
| 29 | 30 | |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -25,6 +25,9 @@ |
| 26 | 26 | $this->skinname = 'monobook'; |
| 27 | 27 | $this->stylename = 'monobook'; |
| 28 | 28 | $this->template = 'MonoBookTemplate'; |
| | 29 | + # Bug 14520: skins that just include this file shouldn't load nonexis- |
| | 30 | + # tent CSS fix files. |
| | 31 | + $this->fixfiles = array( 'IE', 'IE50', 'IE55', 'IE60', 'IE70' ); |
| 29 | 32 | } |
| 30 | 33 | } |
| 31 | 34 | |
| — | — | @@ -62,12 +65,12 @@ |
| 63 | 66 | @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>"; |
| 64 | 67 | /*]]>*/</style> |
| 65 | 68 | <link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('printcss') ?>?<?php echo $GLOBALS['wgStyleVersion'] ?>" /> |
| 66 | | - <!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| 67 | | - <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| 68 | | - <!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| 69 | | - <!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| 70 | | - <!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script> |
| 71 | | - <meta http-equiv="imagetoolbar" content="no" /><![endif]--> |
| | 69 | + <?php if( in_array( 'IE50', $skin->fixfiles ) ) { ?><!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| | 70 | + <?php } if( in_array( 'IE55', $skin->fixfiles ) ) { ?><!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| | 71 | + <?php } if( in_array( 'IE60', $skin->fixfiles ) ) { ?><!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| | 72 | + <?php } if( in_array( 'IE70', $skin->fixfiles ) ) { ?><!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| | 73 | + <?php } ?><!--[if lt IE 7]><?php if( in_array( 'IE', $skin->fixfiles ) ) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script> |
| | 74 | + <?php } ?><meta http-equiv="imagetoolbar" content="no" /><![endif]--> |
| 72 | 75 | |
| 73 | 76 | <?php print Skin::makeGlobalVariablesScript( $this->data ); ?> |
| 74 | 77 | |
| — | — | @@ -284,4 +287,3 @@ |
| 285 | 288 | wfRestoreWarnings(); |
| 286 | 289 | } // end of execute() method |
| 287 | 290 | } // end of class |
| 288 | | -?> |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -87,6 +87,12 @@ |
| 88 | 88 | */ |
| 89 | 89 | var $template; |
| 90 | 90 | |
| | 91 | + /** |
| | 92 | + * An array of CSS fixes files to load for IE, in conditional comments. |
| | 93 | + * May include: 'IE', 'IE50', 'IE55', 'IE60', 'IE70'. |
| | 94 | + */ |
| | 95 | + var $fixfiles; |
| | 96 | + |
| 91 | 97 | /**#@-*/ |
| 92 | 98 | |
| 93 | 99 | /** |
| — | — | @@ -101,6 +107,7 @@ |
| 102 | 108 | $this->skinname = 'monobook'; |
| 103 | 109 | $this->stylename = 'monobook'; |
| 104 | 110 | $this->template = 'QuickTemplate'; |
| | 111 | + $this->fixfiles = array(); |
| 105 | 112 | } |
| 106 | 113 | |
| 107 | 114 | /** |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -369,6 +369,7 @@ |
| 370 | 370 | recent changes page. |
| 371 | 371 | * (bug 14511) MediaWiki:Delete-legend is no longer double escaped |
| 372 | 372 | * Generate correct section anchors for numeric headers |
| | 373 | +* (bug 14520) Don't load nonexistent CSS fix files for Chick, Myskin, Simple |
| 373 | 374 | |
| 374 | 375 | === API changes in 1.13 === |
| 375 | 376 | |