| Index: trunk/extensions/SemanticForms/specials/SF_RunQuery.php |
| — | — | @@ -130,16 +130,8 @@ |
| 131 | 131 | if ( $embedded ) { |
| 132 | 132 | $wgParser->getOutput()->addHeadItem( $script ); |
| 133 | 133 | } else { |
| 134 | | - // method was added in MW 1.16 |
| 135 | | - if ( method_exists( $wgParser->getOutput(), 'getHeadItems' ) ) { |
| 136 | | - $wgOut->addScript( $script . implode($wgParser->getOutput()->getHeadItems() ) ); |
| 137 | | - } else { |
| 138 | | - $wgOut->addScript( $script . implode($wgParser->getOutput()->mHeadItems ) ); |
| 139 | | - } |
| 140 | | - // include modules registered with the ResourceLoader |
| 141 | | - if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) { |
| 142 | | - $wgOut->addModules( $wgParser->getOutput()->getModules() ); |
| 143 | | - } |
| | 134 | + $wgOut->addScript( $script ); |
| | 135 | + $wgOut->addParserOutputNoText( $wgParser->getOutput() ); |
| 144 | 136 | } |
| 145 | 137 | } |
| 146 | 138 | } |
| Index: trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php |
| — | — | @@ -149,7 +149,7 @@ |
| 150 | 150 | $value = trim( $param ); |
| 151 | 151 | if ( count( $elements ) > 1 ) { |
| 152 | 152 | $param_name = trim( $elements[0] ); |
| 153 | | - $value = trim( $elements[1] ); |
| | 153 | + $value = trim( $parser->recursiveTagParse( $elements[1] ) ); |
| 154 | 154 | } |
| 155 | 155 | if ( $param_name == 'form' ) |
| 156 | 156 | $inFormName = $value; |
| — | — | @@ -238,7 +238,7 @@ |
| 239 | 239 | $value = trim( $param ); |
| 240 | 240 | if ( count( $elements ) > 1 ) { |
| 241 | 241 | $param_name = trim( $elements[0] ); |
| 242 | | - $value = trim( $elements[1] ); |
| | 242 | + $value = trim( $parser->recursiveTagParse( $elements[1] ) ); |
| 243 | 243 | } |
| 244 | 244 | if ( $param_name == 'form' ) |
| 245 | 245 | $inFormName = $value; |
| — | — | @@ -522,13 +522,15 @@ |
| 523 | 523 | // load extensions JavaScript |
| 524 | 524 | $parser->getOutput()->addHeadItem( |
| 525 | 525 | '<script type="text/javascript" src="' . $sfgScriptPath |
| 526 | | - . '/libs/SF_popupform.js"></script> ' . "\n" |
| | 526 | + . '/libs/SF_popupform.js"></script> ' . "\n", |
| | 527 | + 'sf_poup_script' |
| 527 | 528 | ); |
| 528 | 529 | |
| 529 | 530 | // load extensions style sheet |
| 530 | 531 | $parser->getOutput()->addHeadItem( |
| 531 | 532 | '<link rel="stylesheet" href="' . $sfgScriptPath |
| 532 | | - . '/skins/SF_popupform.css"/> ' . "\n" |
| | 533 | + . '/skins/SF_popupform.css"/> ' . "\n", |
| | 534 | + 'sf_poup_style' |
| 533 | 535 | ); |
| 534 | 536 | |
| 535 | 537 | $loaded = true; |
| Index: trunk/extensions/SemanticForms/libs/SF_popupform.js |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | |
| 14 | 14 | // register formlink with link |
| 15 | 15 | jQuery('a.popupformlink').click(function(evt){ |
| 16 | | - return ext.popupform.handlePopupFormLink( evt.target.getAttribute('href'), this ); |
| | 16 | + return ext.popupform.handlePopupFormLink( this.getAttribute('href'), this ); |
| 17 | 17 | }); |
| 18 | 18 | |
| 19 | 19 | // register formlink with button |