| Index: trunk/extensions/SemanticForms/includes/forminputs/SF_TextAreaInput.php |
| — | — | @@ -38,7 +38,8 @@ |
| 39 | 39 | // Use a special ID for the free text field, for FCK's needs. |
| 40 | 40 | $input_id = $input_name == 'free_text' ? 'free_text' : "input_$sfgFieldNum"; |
| 41 | 41 | |
| 42 | | - if ( array_key_exists( 'wikieditor', $other_args ) && |
| | 42 | + if ( array_key_exists( 'editor', $other_args ) && |
| | 43 | + $other_args['editor'] == 'wikieditor' && |
| 43 | 44 | |
| 44 | 45 | method_exists( $wgOut, 'getResourceLoader' ) && |
| 45 | 46 | in_array( 'jquery.wikiEditor', $wgOut->getResourceLoader()->getModuleNames() ) && |
| — | — | @@ -170,9 +171,15 @@ |
| 171 | 172 | * Returns the HTML code to be included in the output page for this input. |
| 172 | 173 | */ |
| 173 | 174 | public function getHtmlText() { |
| | 175 | + |
| 174 | 176 | return self::getHTML( |
| 175 | | - $this->mCurrentValue, $this->mInputName, $this->mIsMandatory, $this->mIsDisabled, $this->mOtherArgs |
| | 177 | + $this->mCurrentValue, |
| | 178 | + $this->mInputName, |
| | 179 | + $this->mIsMandatory, |
| | 180 | + $this->mIsDisabled, |
| | 181 | + $this->mOtherArgs |
| 176 | 182 | ); |
| | 183 | + |
| 177 | 184 | } |
| 178 | 185 | |
| 179 | 186 | } |
| Index: trunk/extensions/SemanticForms/includes/forminputs/SF_TextAreaWithAutocompleteInput.php |
| — | — | @@ -48,7 +48,8 @@ |
| 49 | 49 | |
| 50 | 50 | $input_id = 'input_' . $sfgFieldNum; |
| 51 | 51 | |
| 52 | | - if ( array_key_exists( 'wikieditor', $other_args ) && |
| | 52 | + if ( array_key_exists( 'editor', $other_args ) && |
| | 53 | + $other_args['editor'] == 'wikieditor' && |
| 53 | 54 | |
| 54 | 55 | method_exists( $wgOut, 'getResourceLoader' ) && |
| 55 | 56 | in_array( 'jquery.wikiEditor', $wgOut->getResourceLoader()->getModuleNames() ) && |