aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-04-26 21:08:44 +0000
committerplegall <plg@piwigo.org>2006-04-26 21:08:44 +0000
commita52bf8e293c0b55b4d877b154bfd349486897d99 (patch)
treed708a788df1f5c2f6dcbd4ca62e757938d65d5e0
parent79cabc6fd9a9b48e89b28de51f32078d2a75cd30 (diff)
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
-rw-r--r--admin/include/functions.php10
-rw-r--r--admin/site_update.php9
-rw-r--r--include/config_default.inc.php8
3 files changed, 14 insertions, 13 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index f9435b1f1..a7402080e 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -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'};
}
diff --git a/admin/site_update.php b/admin/site_update.php
index 547e72c36..ac4c22c24 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -247,12 +247,13 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id
'dir' => $dir,
'name' => str_replace('_', ' ', $dir),
'site_id' => $site_id,
- 'commentable' => $conf['newcat_default_commentable'],
+ 'commentable' =>
+ boolean_to_string($conf['newcat_default_commentable']),
'uploadable' => $site_is_remote
? false
- : $conf['newcat_default_uploadable'],
- 'status' => $conf{'newcat_default_status'},
- 'visible' => $conf{'newcat_default_visible'},
+ : boolean_to_string($conf['newcat_default_uploadable']),
+ 'status' => boolean_to_string($conf{'newcat_default_status'}),
+ 'visible' => boolean_to_string($conf{'newcat_default_visible'}),
);
if (isset($db_fulldirs[dirname($fulldir)]))
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 0a5a8e551..ec432f210 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -110,16 +110,16 @@ $conf['calendar_month_cell_height']=80;
// newcat_default_commentable : at creation, must a category be commentable
// or not ?
-$conf['newcat_default_commentable'] = 'true';
+$conf['newcat_default_commentable'] = true;
// newcat_default_uploadable : at creation, must a category be uploadable or
// not ?
-$conf['newcat_default_uploadable'] = 'false';
+$conf['newcat_default_uploadable'] = false;
// newcat_default_visible : at creation, must a category be visible or not ?
// Warning : if the parent category is invisible, the category is
// automatically create invisible. (invisible = locked)
-$conf['newcat_default_visible'] = 'true';
+$conf['newcat_default_visible'] = true;
// newcat_default_status : at creation, must a category be public or private
// ? Warning : if the parent category is private, the category is
@@ -127,7 +127,7 @@ $conf['newcat_default_visible'] = 'true';
$conf['newcat_default_status'] = 'public';
// newuser_default_enabled_high : at creation, must a user with enabled_high or not
-$conf['newuser_default_enabled_high'] = 'true';
+$conf['newuser_default_enabled_high'] = true;
// level_separator : character string used for separating a category level
// to the sub level. Suggestions : ' / ', ' &raquo; ', ' &rarr; ', ' - ',