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
This commit is contained in:
plegall
2014-10-26 09:43:43 +00:00
parent 98cf2105b7
commit 3f835e9aae

View File

@@ -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']
)
);