Changeset 1278

Timestamp:

Apr 26, 2006, 11:08:44 PM (18 years ago)

Author:

plg

Message:

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

Location:

trunk

Files:

• admin/include/functions.php (modified) (3 diffs)
• admin/site_update.php (modified) (1 diff)
• include/config_default.inc.php (modified) (2 diffs)

trunk/admin/include/functions.php

@@ -1570 +1570 @@
     'name' => $category_name,
     'rank' => ++$current_rank,
-    'commentable' => $conf['newcat_default_commentable'],
+    'commentable' => boolean_to_string($conf['newcat_default_commentable']),
     'uploadable' => 'false',
     );
@@ -1595 +1595 @@
     else
     {
-      $insert{'visible'} = $conf['newcat_default_visible'];
+      $insert{'visible'} = boolean_to_string($conf['newcat_default_visible']);
     }
 
@@ -1607 +1607 @@
     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'};
   }

trunk/admin/site_update.php

@@ -248 +248 @@
         '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'}),
         );
 

trunk/include/config_default.inc.php

@@ -111 +111 @@
 // 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
@@ -128 +128 @@
 
 // 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