https://www.mediawiki.org/wiki/Special:Code/MediaWiki/107647
Revision: 107647
Author: yaron
Date: 2011-12-30 19:03:36 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
There is only one class for now upload window - SFUploadWindow
Modified Paths:
--------------
trunk/extensions/SemanticForms/SemanticForms.php
trunk/extensions/SemanticForms/specials/SF_UploadWindow.php
Modified: trunk/extensions/SemanticForms/SemanticForms.php
===================================================================
--- trunk/extensions/SemanticForms/SemanticForms.php 2011-12-30 19:03:07 UTC
(rev 107646)
+++ trunk/extensions/SemanticForms/SemanticForms.php 2011-12-30 19:03:36 UTC
(rev 107647)
@@ -127,14 +127,8 @@
$wgSpecialPages['RunQuery'] = 'SFRunQuery';
$wgAutoloadClasses['SFRunQuery'] = $sfgIP . '/specials/SF_RunQuery.php';
$wgSpecialPageGroups['RunQuery'] = 'sf_group';
-// different upload-window class for MW 1.16+
-if ( class_exists( 'HTMLTextField' ) ) { // added in MW 1.16
- $wgSpecialPages['UploadWindow'] = 'SFUploadWindow2';
- $wgAutoloadClasses['SFUploadWindow2'] = $sfgIP .
'/specials/SF_UploadWindow2.php';
-} else {
- $wgSpecialPages['UploadWindow'] = 'SFUploadWindow';
- $wgAutoloadClasses['SFUploadWindow'] = $sfgIP .
'/specials/SF_UploadWindow.php';
-}
+$wgSpecialPages['UploadWindow'] = 'SFUploadWindow';
+$wgAutoloadClasses['SFUploadWindow'] = $sfgIP .
'/specials/SF_UploadWindow.php';
$wgAutoloadClasses['SFTemplateField'] = $sfgIP .
'/includes/SF_TemplateField.php';
$wgAutoloadClasses['SFForm'] = $sfgIP . '/includes/SF_Form.php';
$wgAutoloadClasses['SFTemplateInForm'] = $sfgIP .
'/includes/SF_TemplateInForm.php';
Modified: trunk/extensions/SemanticForms/specials/SF_UploadWindow.php
===================================================================
--- trunk/extensions/SemanticForms/specials/SF_UploadWindow.php 2011-12-30
19:03:07 UTC (rev 107646)
+++ trunk/extensions/SemanticForms/specials/SF_UploadWindow.php 2011-12-30
19:03:36 UTC (rev 107647)
@@ -1,7 +1,6 @@
<?php
/**
- * SFUploadWindow2 - used for uploading files from within a form, for
- * MediaWiki version 1.16+.
+ * SFUploadWindow - used for uploading files from within a form.
* This class is nearly identical to MediaWiki's SpecialUpload class, with
* a few changes to remove skin CSS and HTML, and to populate the relevant
* field in the form with the name of the uploaded form.
@@ -14,7 +13,7 @@
/**
* @ingroup SFSpecialPages
*/
-class SFUploadWindow2Proto extends UnlistedSpecialPage {
+class SFUploadWindowProto extends UnlistedSpecialPage {
/**
* Constructor : initialise object
* Get data POSTed through the form and assign them to the object
@@ -1114,7 +1113,7 @@
/**
* Class variant for MW 1.18+
*/
- class SFUploadWindow2 extends SFUploadWindow2Proto {
+ class SFUploadWindow extends SFUploadWindowProto {
/**
* This page can be shown if uploading is enabled.
* Handle permission checking elsewhere in order to be able to
show
@@ -1135,7 +1134,7 @@
/**
* Class variant for MW up to 1.17
*/
- class SFUploadWindow2 extends SFUploadWindow2Proto {
+ class SFUploadWindow extends SFUploadWindowProto {
/**
* This page can be shown if uploading is enabled.
* Handle permission checking elsewhere in order to be able to
show
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
