Fixes loading of network type config

diff --git a/inc/modules/admin/what-config_network_types.php b/inc/modules/admin/what-config_network_types.php
index a2666bb..01800dc 100644 (file)
--- a/inc/modules/admin/what-config_network_types.php
+++ b/inc/modules/admin/what-config_network_types.php
@@ -94,7 +94,7 @@ LIMIT 1',
                        $result_config = SQL_QUERY_ESC('SELECT
        `network_data_id`,
        `network_max_reload_time`,
                        $result_config = SQL_QUERY_ESC('SELECT
        `network_data_id`,
        `network_max_reload_time`,

-       `network_min_waiting_time`
+       `network_min_waiting_time`,

        `network_min_remain_clicks`,
        `network_min_payment`,
        `network_allow_erotic`
        `network_min_remain_clicks`,
        `network_min_payment`,
        `network_allow_erotic`


@@ -186,10 +186,10 @@ LIMIT 1',
                        // Do we have an entry?
                        if (SQL_NUMROWS($result_config) == 1) {
                                // Load this data as well
                        // Do we have an entry?
                        if (SQL_NUMROWS($result_config) == 1) {
                                // Load this data as well

-                               $contentConfig = merge_array($content, SQL_FETCHARRAY($result_config));
+                               $content = merge_array($content, SQL_FETCHARRAY($result_config));

 
                                // Add it with extra template
 
                                // Add it with extra template

-                               $content['network_type_config_content'] = loadTemplate('admin_show_config_network_type', true, $contentConfig);
+                               $content['network_type_config_content'] = loadTemplate('admin_show_config_network_type', true, $content);

                        } else {
                                // No configuration found, so display form
                                $content['network_type_config_content'] = loadTemplate('admin_add_config_network_type', true, $content);
                        } else {
                                // No configuration found, so display form
                                $content['network_type_config_content'] = loadTemplate('admin_add_config_network_type', true, $content);

diff --git a/templates/de/html/admin/admin_show_config_network_type.tpl b/templates/de/html/admin/admin_show_config_network_type.tpl
index 5fc8007..4905da4 100644 (file)
--- a/templates/de/html/admin/admin_show_config_network_type.tpl
+++ b/templates/de/html/admin/admin_show_config_network_type.tpl
@@ -10,7 +10,7 @@
        </div>
        <div>
                {--ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}<br />
        </div>
        <div>
                {--ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}<br />

-               <strong>{%pipe,translateComma=$content[network_min_waiting_time]%}</strong>
+               <strong>{%pipe,fixEmptyContentToDashes=$content[network_min_waiting_time]%}</strong>

        </div>
        <div>
                {--ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}<br />
        </div>
        <div>
                {--ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}<br />