Move HTML part of oid to template + replace outside the tpl

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 41147fa0106096ce3c0943fc6a57332329cda341..89363541ca8154a2c8223f32d1e0ea2dc9542378 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -710,6 +710,16 @@ function admin_page_users(&$a){
        $users = array_map("_setup_users", $users);
        
        
+       // Get rid of dashes in key names, Smarty3 can't handle them
+       foreach($users as $key => $user) {
+               $new_user = array();
+               foreach($user as $k => $v) {
+                       $k = str_replace('-','_',$k);
+                       $new_user[$k] = $v;
+               }
+               $users[$key] = $new_user;
+       }
+
        $t = get_markup_template("admin_users.tpl");
        $o = replace_macros($t, array(
                // strings //
@@ -1207,7 +1217,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'],''),
        ));
        
 }