Changeset 6421

Timestamp:

Apr 8, 2008, 5:39:57 PM (14 years ago)

Author:

ogawa

Message:

#2059:merged:システムプロフィールが残っていたので修正

Location:

OpenPNE/branches/work/ogawa/2059_profile/webapp/modules/admin

Files:

• do/csv_member.php (modified) (2 diffs)
• templates/delete_c_member_confirm.tpl (modified) (1 diff)

OpenPNE/branches/work/ogawa/2059_profile/webapp/modules/admin/do/csv_member.php

@@ -90 +90 @@
             $c_profile_list = db_member_c_profile_list4null();
             foreach ($c_profile_list as $key => $tmp_profile) {
-                if (is_array($tmp_profile_list[$tmp_profile['name']]['value'])){
-                    foreach ($tmp_profile_list[$tmp_profile['name']]['value'] as $itm){
-                        $tmp_c_member[$tmp_profile['name']] .= $itm . " ";
+                if ($tmp_profile['use_member_profile']){
+                    if (is_array($tmp_profile_list[$tmp_profile['name']]['value'])){
+                        foreach ($tmp_profile_list[$tmp_profile['name']]['value'] as $itm){
+                            $tmp_c_member[$tmp_profile['name']] .= $itm . " ";
+                        }
+                    } else {
+                        $tmp_c_member[$tmp_profile['name']] = $tmp_profile_list[$tmp_profile['name']]['value'];
                     }
-                } else {
-                    $tmp_c_member[$tmp_profile['name']] = $tmp_profile_list[$tmp_profile['name']]['value'];
                 }
             }
@@ -142 +144 @@
         $ley_list[]="誕生日";
         foreach ($c_profile_list as $profile) {
-            if ($profile['name'] != 'PNE_POINT') {
-                $ley_list[]= $profile['caption'];
+            if ($profile['use_member_profile']){
+                if ($profile['name'] != 'PNE_POINT') {
+                    $ley_list[]= $profile['caption'];
+                }
             }
         }

OpenPNE/branches/work/ogawa/2059_profile/webapp/modules/admin/templates/delete_c_member_confirm.tpl

@@ -48 +48 @@
         </tr>
         ({foreach from=$c_profile_list item=prof})
+        ({if $prof.use_member_profile})
         <tr>
                 <th>({$prof.caption})</th>
                 <td>({if $prof.form_type == checkbox})({$c_member.profile[$prof.name].value|@t_implode:", "})({else})({$c_member.profile[$prof.name].value|t_truncate:60|nl2br})({/if})</td>
         </tr>
+        ({/if})
         ({/foreach})
         <tr>