| Index: trunk/extensions/SemanticForms/SemanticForms.php |
| — | — | @@ -127,14 +127,8 @@ |
| 128 | 128 | $wgSpecialPages['RunQuery'] = 'SFRunQuery'; |
| 129 | 129 | $wgAutoloadClasses['SFRunQuery'] = $sfgIP . '/specials/SF_RunQuery.php'; |
| 130 | 130 | $wgSpecialPageGroups['RunQuery'] = 'sf_group'; |
| 131 | | -// different upload-window class for MW 1.16+ |
| 132 | | -if ( class_exists( 'HTMLTextField' ) ) { // added in MW 1.16 |
| 133 | | - $wgSpecialPages['UploadWindow'] = 'SFUploadWindow2'; |
| 134 | | - $wgAutoloadClasses['SFUploadWindow2'] = $sfgIP . '/specials/SF_UploadWindow2.php'; |
| 135 | | -} else { |
| 136 | | - $wgSpecialPages['UploadWindow'] = 'SFUploadWindow'; |
| 137 | | - $wgAutoloadClasses['SFUploadWindow'] = $sfgIP . '/specials/SF_UploadWindow.php'; |
| 138 | | -} |
| | 131 | +$wgSpecialPages['UploadWindow'] = 'SFUploadWindow'; |
| | 132 | +$wgAutoloadClasses['SFUploadWindow'] = $sfgIP . '/specials/SF_UploadWindow.php'; |
| 139 | 133 | $wgAutoloadClasses['SFTemplateField'] = $sfgIP . '/includes/SF_TemplateField.php'; |
| 140 | 134 | $wgAutoloadClasses['SFForm'] = $sfgIP . '/includes/SF_Form.php'; |
| 141 | 135 | $wgAutoloadClasses['SFTemplateInForm'] = $sfgIP . '/includes/SF_TemplateInForm.php'; |
| Index: trunk/extensions/SemanticForms/specials/SF_UploadWindow.php |
| — | — | @@ -1,7 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | /** |
| 4 | | - * SFUploadWindow2 - used for uploading files from within a form, for |
| 5 | | - * MediaWiki version 1.16+. |
| | 4 | + * SFUploadWindow - used for uploading files from within a form. |
| 6 | 5 | * This class is nearly identical to MediaWiki's SpecialUpload class, with |
| 7 | 6 | * a few changes to remove skin CSS and HTML, and to populate the relevant |
| 8 | 7 | * field in the form with the name of the uploaded form. |
| — | — | @@ -14,7 +13,7 @@ |
| 15 | 14 | /** |
| 16 | 15 | * @ingroup SFSpecialPages |
| 17 | 16 | */ |
| 18 | | -class SFUploadWindow2Proto extends UnlistedSpecialPage { |
| | 17 | +class SFUploadWindowProto extends UnlistedSpecialPage { |
| 19 | 18 | /** |
| 20 | 19 | * Constructor : initialise object |
| 21 | 20 | * Get data POSTed through the form and assign them to the object |
| — | — | @@ -1114,7 +1113,7 @@ |
| 1115 | 1114 | /** |
| 1116 | 1115 | * Class variant for MW 1.18+ |
| 1117 | 1116 | */ |
| 1118 | | - class SFUploadWindow2 extends SFUploadWindow2Proto { |
| | 1117 | + class SFUploadWindow extends SFUploadWindowProto { |
| 1119 | 1118 | /** |
| 1120 | 1119 | * This page can be shown if uploading is enabled. |
| 1121 | 1120 | * Handle permission checking elsewhere in order to be able to show |
| — | — | @@ -1135,7 +1134,7 @@ |
| 1136 | 1135 | /** |
| 1137 | 1136 | * Class variant for MW up to 1.17 |
| 1138 | 1137 | */ |
| 1139 | | - class SFUploadWindow2 extends SFUploadWindow2Proto { |
| | 1138 | + class SFUploadWindow extends SFUploadWindowProto { |
| 1140 | 1139 | /** |
| 1141 | 1140 | * This page can be shown if uploading is enabled. |
| 1142 | 1141 | * Handle permission checking elsewhere in order to be able to show |