merge -r1276:1277 from branch-1_6 to trunk (bug 228 fixed)

git-svn-id: http://piwigo.org/svn/trunk@1278 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2006-04-26 21:08:44 +00:00
parent 79cabc6fd9
commit a52bf8e293
3 changed files with 14 additions and 13 deletions
+5 -5
View File
@@ -1569,7 +1569,7 @@ SELECT MAX(rank)
$insert = array(
'name' => $category_name,
'rank' => ++$current_rank,
'commentable' => $conf['newcat_default_commentable'],
'commentable' => boolean_to_string($conf['newcat_default_commentable']),
'uploadable' => 'false',
);
@@ -1594,7 +1594,7 @@ SELECT id, uppercats, global_rank, visible, status
}
else
{
$insert{'visible'} = $conf['newcat_default_visible'];
$insert{'visible'} = boolean_to_string($conf['newcat_default_visible']);
}
// at creation, must a category be public or private ? Warning : if the
@@ -1606,13 +1606,13 @@ SELECT id, uppercats, global_rank, visible, status
}
else
{
$insert{'status'} = $conf['newcat_default_status'];
$insert{'status'} = boolean_to_string($conf['newcat_default_status']);
}
}
else
{
$insert{'visible'} = $conf['newcat_default_visible'];
$insert{'status'} = $conf['newcat_default_status'];
$insert{'visible'} = boolean_to_string($conf['newcat_default_visible']);
$insert{'status'} = boolean_to_string($conf['newcat_default_status']);
$insert{'global_rank'} = $insert{'rank'};
}