aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-04-27 21:08:50 +0000
committerplegall <plg@piwigo.org>2006-04-27 21:08:50 +0000
commitb0751afea224486bb4b423e569e2c75a502b4e35 (patch)
treedf1273a466fac42bb59e26092fe9219b96207ceb /admin
parentf8d72e48d0f65d5f57aabb236c5fa6e412d88d2b (diff)
merge -r1281:1283 from branch 1.6 to trunk (bug 228 fixed one more time, and
other little things) git-svn-id: http://piwigo.org/svn/trunk@1284 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions.php4
-rw-r--r--admin/site_update.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index a7402080e..da21be52c 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1606,13 +1606,13 @@ SELECT id, uppercats, global_rank, visible, status
}
else
{
- $insert{'status'} = boolean_to_string($conf['newcat_default_status']);
+ $insert{'status'} = $conf['newcat_default_status'];
}
}
else
{
$insert{'visible'} = boolean_to_string($conf['newcat_default_visible']);
- $insert{'status'} = boolean_to_string($conf['newcat_default_status']);
+ $insert{'status'} = $conf['newcat_default_status'];
$insert{'global_rank'} = $insert{'rank'};
}
diff --git a/admin/site_update.php b/admin/site_update.php
index ac4c22c24..3347afcc8 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -252,7 +252,7 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id
'uploadable' => $site_is_remote
? false
: boolean_to_string($conf['newcat_default_uploadable']),
- 'status' => boolean_to_string($conf{'newcat_default_status'}),
+ 'status' => $conf{'newcat_default_status'},
'visible' => boolean_to_string($conf{'newcat_default_visible'}),
);