Changeset 4069 for branches/2.0/admin


Ignore:
Timestamp:
Oct 20, 2009, 9:30:09 PM (15 years ago)
Author:
rvelices
Message:

merge -r2048 from trunk to branch 2

  • avoid php warning in template when debug template option is activated
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0/admin/user_list.php

    r4009 r4069  
    531531
    532532// Display or Hide double password type
    533 if ($conf['double_password_type_in_admin'])
    534 {
    535   $template->assign('Double_Password', true);
    536 }
     533$template->assign('Double_Password', $conf['double_password_type_in_admin'] );
    537534
    538535// Filter status options
     
    588585// Template Options
    589586$template->assign('template_options', get_pwg_themes());
    590 $template->assign('template_selected', 
     587$template->assign('template_selected',
    591588    isset($_POST['pref_submit']) ? $_POST['template'] : get_default_template());
    592589
    593590// Language options
    594591$template->assign('language_options', get_languages());
    595 $template->assign('language_selected', 
     592$template->assign('language_selected',
    596593    isset($_POST['pref_submit']) ? $_POST['language'] : get_default_language());
    597594
     
    606603}
    607604$template->assign('pref_status_options', $pref_status_options);
    608 $template->assign('pref_status_selected', 
     605$template->assign('pref_status_selected',
    609606    isset($_POST['pref_submit']) ? $_POST['status'] : 'normal');
    610607
     
    623620}
    624621$template->assign('level_options', $level_options);
    625 $template->assign('level_selected', 
     622$template->assign('level_selected',
    626623    isset($_POST['pref_submit']) ? $_POST['level'] : $default_user['level']);
    627624
     
    664661}
    665662
    666 // allow plugins to fill template var plugin_user_list_column_titles and 
     663// allow plugins to fill template var plugin_user_list_column_titles and
    667664// plugin_columns/plugin_actions for each user in the list
    668665$visible_user_list = trigger_event('loc_visible_user_list', $visible_user_list);
Note: See TracChangeset for help on using the changeset viewer.