| Index: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php |
| — | — | @@ -818,14 +818,14 @@ |
| 819 | 819 | } else { // value is not an array |
| 820 | 820 | $cur_value_in_template = $cur_value; |
| 821 | 821 | } |
| 822 | | - if ( $query_template_name == null || $query_template_name == '' ) |
| | 822 | + if ( $template_name == null || $template_name == '' ) |
| 823 | 823 | $input_name = $field_name; |
| 824 | 824 | elseif ( $allow_multiple ) |
| 825 | 825 | // 'num' will get replaced by an actual index, either in PHP |
| 826 | 826 | // or in Javascript, later on |
| 827 | | - $input_name = $query_template_name . '[num][' . $field_name . ']'; |
| | 827 | + $input_name = $template_name . '[num][' . $field_name . ']'; |
| 828 | 828 | else |
| 829 | | - $input_name = $query_template_name . '[' . $field_name . ']'; |
| | 829 | + $input_name = $template_name . '[' . $field_name . ']'; |
| 830 | 830 | |
| 831 | 831 | // if we're creating the page name from a formula based on |
| 832 | 832 | // form values, see if the current input is part of that formula, |
| — | — | @@ -1214,7 +1214,7 @@ |
| 1215 | 1215 | } |
| 1216 | 1216 | // if the FCKeditor extension is installed, use that for the free text input |
| 1217 | 1217 | global $wgFCKEditorDir; |
| 1218 | | - if ( $wgFCKEditorDir ) { |
| | 1218 | + if ( $wgFCKEditorDir && strpos( $existing_page_content, '__NORICHEDITOR__' ) === false ) { |
| 1219 | 1219 | $showFCKEditor = SFFormUtils::getShowFCKEditor(); |
| 1220 | 1220 | if ( !$form_submitted && ( $showFCKEditor & RTE_VISIBLE ) ) { |
| 1221 | 1221 | $free_text = SFFormUtils::prepareTextForFCK( $free_text ); |