| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_Outputs.php |
| — | — | @@ -59,9 +59,7 @@ |
| 60 | 60 | return self::requireHeadItemOld( $id, $item ); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | | - if ( is_numeric( $id ) ) { |
| 64 | | - global $wgOut; |
| 65 | | - |
| | 63 | + if ( is_numeric( $id ) ) { // compatibility with older extensions; eventually the numeric constants should vanish |
| 66 | 64 | switch ( $id ) { |
| 67 | 65 | case SMW_HEADER_TOOLTIP: |
| 68 | 66 | self::requireResource( 'ext.smw.tooltips' ); |
| — | — | @@ -74,9 +72,8 @@ |
| 75 | 73 | break; |
| 76 | 74 | } |
| 77 | 75 | } |
| 78 | | - else { |
| 79 | | - // This should not be used anymore; use the RL directly. |
| 80 | | - self::$mHeadItems[$id] = $item; |
| | 76 | + else { // normal case: treat ID as a ResourceLoader ID |
| | 77 | + self::requireResource( $id ); |
| 81 | 78 | } |
| 82 | 79 | } |
| 83 | 80 | |
| — | — | @@ -217,4 +214,4 @@ |
| 218 | 215 | self::$mHeadItems = array(); |
| 219 | 216 | } |
| 220 | 217 | |
| 221 | | -} |
| \ No newline at end of file |
| | 218 | +} |