| Index: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php |
| — | — | @@ -347,12 +347,8 @@ |
| 348 | 348 | * enables linkback and autocomplete for search |
| 349 | 349 | */ |
| 350 | 350 | function mvfAutoAllPageHeader() { |
| 351 | | -<<<<<<< .mine |
| 352 | 351 | global $mvgScriptPath, $wgJsMimeType, $wgOut, $mvExtraHeader, $wgTitle, $mvgJSDebug, $wgEnableScriptLoader, $wgRequest, $wgScriptPath; |
| 353 | | - |
| 354 | | -======= |
| 355 | | - global $mvgScriptPath, $wgJsMimeType, $wgOut, $mvExtraHeader, $mvgJSDebug, $wgEnableScriptLoader, $wgRequest;; |
| 356 | | ->>>>>>> .r49450 |
| | 352 | + |
| 357 | 353 | $mvgScriptPath = htmlspecialchars( $mvgScriptPath ); |
| 358 | 354 | $wgJsMimeType = htmlspecialchars( $wgJsMimeType ) ; |
| 359 | 355 | //set the unquie request value |