r60422 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r60421‎ | r60422 | r60423 >
Date:01:20, 27 December 2009
Author:yaron
Status:deferred
Tags:
Comment:
Made class names unique to avoid class-redeclaration error
Modified paths:
  • /trunk/extensions/SemanticForms/specials/SF_UploadWindow2.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticForms/specials/SF_UploadWindow2.php
@@ -203,7 +203,7 @@
204204 global $wgOut;
205205
206206 # Initialize form
207 - $form = new UploadForm( array(
 207+ $form = new SFUploadForm( array(
208208 'watch' => $this->watchCheck(),
209209 'forreupload' => $this->mForReUpload,
210210 'sessionkey' => $sessionKey,
@@ -691,7 +691,7 @@
692692 /**
693693 * Sub class of HTMLForm that provides the form section of SpecialUpload
694694 */
695 -class UploadForm extends HTMLForm {
 695+class SFUploadForm extends HTMLForm {
696696 protected $mWatch;
697697 protected $mForReUpload;
698698 protected $mSessionKey;
@@ -762,7 +762,7 @@
763763
764764 $descriptor = array();
765765 $descriptor['UploadFile'] = array(
766 - 'class' => 'UploadSourceField',
 766+ 'class' => 'SFUploadSourceField',
767767 'section' => 'source',
768768 'type' => 'file',
769769 'id' => 'wpUploadFile',
@@ -780,7 +780,7 @@
781781 if ( $canUploadByUrl ) {
782782 global $wgMaxUploadSize;
783783 $descriptor['UploadFileURL'] = array(
784 - 'class' => 'UploadSourceField',
 784+ 'class' => 'SFUploadSourceField',
785785 'section' => 'source',
786786 'id' => 'wpUploadFileURL',
787787 'label-message' => 'sourceurl',
@@ -1047,7 +1047,7 @@
10481048 /**
10491049 * A form field that contains a radio box in the label
10501050 */
1051 -class UploadSourceField extends HTMLTextField {
 1051+class SFUploadSourceField extends HTMLTextField {
10521052 function getLabelHtml() {
10531053 $id = "wpSourceType{$this->mParams['upload-type']}";
10541054 $label = Html::rawElement( 'label', array( 'for' => $id ), $this->mLabel );

Status & tagging log