[Phpgroupware-cvs] CVS: addressbook/inc class.boaddressbook.inc.php,1.21,1.21.2.1 class.uiaddressbook.inc.php,1.36.2.11,1.36.2.12

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv4605

Modified Files:
      Tag: Version-0_9_14-branch
        class.boaddressbook.inc.php class.uiaddressbook.inc.php 
Log Message:
fix for problem from fix for bug #2200

Index: class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** class.boaddressbook.inc.php 23 Dec 2001 17:28:14 -0000      1.21
--- class.boaddressbook.inc.php 21 Mar 2003 09:13:21 -0000      1.21.2.1
***************
*** 99,111 ****
                        }
  
!                       if(isset($_fcat_id) && !empty($_fcat_id))
                        {
                                $this->cat_id = $_fcat_id;
                        }
!                       if($_fcat_id == '0' || $_fcat_id == 0 || $_fcat_id == 
'')
                        {
!                               $this->cat_id = 0;
                        }
! 
                        if(isset($_sort)   && !empty($_sort))
                        {
--- 99,111 ----
                        }
  
!                       if(isset($GLOBALS['HTTP_POST_VARS']['fcat_id']) || 
isset($GLOBALS['HTTP_POST_VARS']['fcat_id']))
                        {
                                $this->cat_id = $_fcat_id;
                        }
!                       else
                        {
!                               $this->cat_id = -1;
                        }
!                       
                        if(isset($_sort)   && !empty($_sort))
                        {

Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.11
retrieving revision 1.36.2.12
diff -C2 -r1.36.2.11 -r1.36.2.12
*** class.uiaddressbook.inc.php 19 Mar 2003 06:45:19 -0000      1.36.2.11
--- class.uiaddressbook.inc.php 21 Mar 2003 09:13:21 -0000      1.36.2.12
***************
*** 244,251 ****
                        }
  
!                       if (!$this->cat_id)
                        {
                                $this->cat_id = 
$this->prefs['default_category'];
                        } 
                        if ($this->prefs['autosave_category'])
                        {
--- 244,255 ----
                        }
  
!                       if ($this->cat_id == -1)
                        {
                                $this->cat_id = 
$this->prefs['default_category'];
                        } 
+                       else
+                       {
+                               echo "cat_id: '$this->cat_id'<br>\n";
+                       }
                        if ($this->prefs['autosave_category'])
                        {