Merge pull request #555 from annando/master

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 41147fa0106096ce3c0943fc6a57332329cda341..c951dd8b9cd7d4d1b3bb0f58fa9adc900f8e7ceb 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -455,7 +455,16 @@ function admin_page_site(&$a) {
        );
 
        $t = get_markup_template("admin_site.tpl");
-       return replace_macros($t, array(
+
+       $includes = array(
+               '$field_checkbox'       => 'field_checkbox.tpl',
+               '$field_input'          => 'field_input.tpl',
+               '$field_select'         => 'field_select.tpl',
+               '$field_textarea'       => 'field_textarea.tpl',
+       );
+       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+       return replace_macros($t, $includes + array(
                '$title' => t('Administration'),
                '$page' => t('Site'),
                '$submit' => t('Submit'),
@@ -1135,7 +1144,14 @@ readable.");
                }
        }                       
 
-       return replace_macros($t, array(
+       $includes = array(
+               '$field_checkbox'       => 'field_checkbox.tpl',
+               '$field_input'          => 'field_input.tpl',
+               '$field_select'         => 'field_select.tpl',
+       );
+       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+       return replace_macros($t, $includes + array(
                '$title' => t('Administration'),
                '$page' => t('Logs'),
                '$submit' => t('Submit'),
@@ -1194,7 +1210,14 @@ function admin_page_remoteupdate(&$a) {
        }
        
        $tpl = get_markup_template("admin_remoteupdate.tpl");
-       return replace_macros($tpl, array(
+
+       $includes = array(
+               '$field_input'          => 'field_input.tpl',
+               '$field_password'       => 'field_password.tpl',
+       );
+       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+       return replace_macros($tpl, $includes + array(
                '$baseurl' => $a->get_baseurl(true),
                '$submit' => t("Update now"),
                '$close' => t("Close"),
@@ -1207,7 +1230,7 @@ function admin_page_remoteupdate(&$a) {
                '$ftppath'      => array('ftppath', t("FTP Path"), '/',''),
                '$ftpuser'      => array('ftpuser', t("FTP User"), '',''),
                '$ftppwd'       => array('ftppwd', t("FTP Password"), '',''),
-               '$remotefile'=>array('remotefile','', $u['2'],'')
+               '$remotefile'=>array('remotefile','', $u['2'],''),
        ));
        
 }