diff options
| author | plegall <plg@piwigo.org> | 2014-10-26 09:43:43 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2014-10-26 09:43:43 +0000 |
| commit | 3f835e9aae1c074eb763ea1da4873e20c8a686d7 (patch) | |
| tree | 9d0235a5f92fabee9bf53f1cc31dfa9dcf5a403a /admin/user_list.php | |
| parent | 98cf2105b7811c88399583feb826f97338a94363 (diff) | |
merge r30310 from trunk to branch 2.7
bug 3165 fixed: template variable ACTIVATE_COMMENTS had been accidentally removed with Piwigo 2.6
git-svn-id: http://piwigo.org/svn/branches/2.7@30311 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/user_list.php')
| -rw-r--r-- | admin/user_list.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/user_list.php b/admin/user_list.php index d9f85b6bd..83815f66f 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -86,6 +86,7 @@ $template->assign( array( 'users' => $users, 'all_users' => join(',', $user_ids), + 'ACTIVATE_COMMENTS' => $conf['activate_comments'], 'Double_Password' => $conf['double_password_type_in_admin'] ) ); |