metaform: fixed bug with listing but no display page (some links got an extra _edit...

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index 04e786a..19e2168 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -268,9 +268,6 @@ function make_html($whole_file = true) {
                }
 
                if($GLOBALS['opt_listing'] == 'Yes') {
-                       if($GLOBALS['opt_display'] != 'Yes') {
-                               $tem->show('opt_display_a_else');
-                       }
                        if(show_in_listing($type, $input, $format, $sql)) {
                                if($format == 'bool' || $format == 'yesno') {
                                        $tem->set('listing_enc', 'yesno');
@@ -284,6 +281,10 @@ function make_html($whole_file = true) {
                                        $tem->set('listing_enc', 'html');
                                        $tem->show('listing_value_enc');
                                }
+
+                               if($GLOBALS['opt_display'] != 'Yes') {
+                                       $tem->show('opt_display_a_else');
+                               }
                                $tem->show('listing_head_col');
                                $tem->show('listing_row_col');
                        }
@@ -351,6 +352,7 @@ function show_in_listing($type, $input, $format, $sql) {
 }
 
 function make_php() {
+       $has_html_editors = false;
        $tem = new tem();
        $tem->load('code/wfpl/metaform/template.php');
        $tem->set('file_name', $GLOBALS['file_name']);
@@ -389,7 +391,9 @@ function make_php() {
                                        $image_included_yet = true;
                                }
                        } else {
-                               if($input == 'pulldown') {
+                               if($input == 'html') {
+                                       $has_html_editors = true;
+                               } elseif($input == 'pulldown') {
                                        $tem->show('pulldowns');
                                        $tem->show('pulldown_format_extra');
                                }
@@ -406,6 +410,10 @@ function make_php() {
                }
        }
 
+       if($has_html_editors) {
+               $tem->show('show_extra_headers');
+       }
+
        $tem->set('always_field', $always_field);
        $tem->set('db_fields', $db_fields);
        $tem->set('php_fields', $php_fields);