Changeset 387

Timestamp:

Mar 5, 2004, 11:55:04 PM (21 years ago)

Author:

z0rglub

Message:

deletion of expand string in $_GET array

File:

• trunk/include/functions_category.inc.php (modified) (3 diffs)

trunk/include/functions_category.inc.php

@@ -88 +88 @@
   $query.= ' ON c.id = uc.category_id';
   $query.= ' WHERE user_id = '.$user['id'];
-  if ( $page['expand'] != 'all' )
+  if ( !$user['expand'] )
   {
     $query.= ' AND (id_uppercat is NULL';
     if ( count( $page['tab_expand'] ) > 0 )
     {
-      $query.= ' OR id_uppercat IN ('.$page['expand'].')';
+      $query.= ' OR id_uppercat IN ('.implode(',',$page['tab_expand']).')';
     }
     $query.= ')';
@@ -175 +175 @@
     // update the "expanded" key
     if ( $user['expand']
-         or $page['expand'] == 'all'
          or in_array( $category['id'], $page['tab_expand'] ) )
     {
@@ -183 +182 @@
     {
       $category['expanded'] = false;
-    }
-    // update the "expand_string" key
-    if ( $page['expand'] == 'all' )
-    {
-      $category['expand_string'] = 'all';
-    }
-    else
-    {
-      $tab_expand = $page['tab_expand'];
-      if ( in_array( $category['id'], $page['tab_expand'] ) )
-      {
-        // the expand string corresponds to the $page['tab_expand'] without
-        // the $category['id']
-        $tab_expand = array_diff( $page['tab_expand'],array($category['id']) );
-      }
-      else if ( $category['nb_sub_categories'] > 0 )
-      {
-        // we have this time to add the $category['id']...
-        $tab_expand = array_merge($page['tab_expand'],array($category['id']));
-      }
-      $category['expand_string'] = implode( ',', $tab_expand );
     }
     // recursive call