[Phpgroupware-cvs] phpgwapi/inc class.categories.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/08/29 08:27:25

Modified files:
        inc            : class.categories.inc.php 

Log message:
        fix E_NOTICES from using undefined variables

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.categories.inc.php?cvsroot=phpgwapi&r1=1.127&r2=1.128

Patches:
Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- class.categories.inc.php    19 Jul 2006 01:40:11 -0000      1.127
+++ class.categories.inc.php    29 Aug 2006 08:27:25 -0000      1.128
@@ -7,7 +7,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: class.categories.inc.php,v 1.127 2006/07/19 01:40:11 
skwashd Exp $
+       * @version $Id: class.categories.inc.php,v 1.128 2006/08/29 08:27:25 
skwashd Exp $
        */
 
        /**
@@ -435,13 +435,13 @@
                        if(is_array($format))
                        {
                                $temp_format = $format['format'];
-                               $type = ($format['type']?$format['type']:'all');
-                               $selected = 
(isset($format['selected'])?$format['selected']:'');
-                               $self = 
(isset($format['self'])?$format['self']:'');
-                               $globals = 
(isset($format['globals'])?$format['globals']:True);
-                               $site_link = 
(isset($format['site_link'])?$format['site_link']:'site');
+                               $type = isset($format['type']) ? 
$format['type'] : 'all';
+                               $selected = isset($format['selected']) ? 
$format['selected'] : '';
+                               $self = isset($format['self']) ? 
$format['self'] : '';
+                               $globals = isset($format['globals']) ? 
$format['globals'] : true;
+                               $site_link = isset($format['site_link']) ? 
$format['site_link'] : 'site';
                                settype($format,'string');
-                               $format = ($temp_format?$temp_format:'select');
+                               $format = $temp_format ? $temp_format : 
'select';
                                unset($temp_format);
                        }
 
@@ -452,11 +452,11 @@
 
                        if ($type != 'all')
                        {
-                               $cats = 
$this->return_array($type,$start,False,$query,$sort,$order,$globals);
+                               $cats = $this->return_array($type, 0, False, 
'', '', '',$globals);
                        }
                        else
                        {
-                               $cats = 
$this->return_sorted_array($start,False,$query,$sort,$order,$globals);
+                               $cats = $this->return_sorted_array(0, False, 
'', '', '',$globals);
                        }
 
                        if($self)