phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] etemplate/inc class.boetemplate.inc.php class.d...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] etemplate/inc class.boetemplate.inc.php class.d...
Date: Tue, 13 Feb 2007 19:52:04 +0000

CVSROOT:        /sources/phpgroupware
Module name:    etemplate
Changes by:     Sigurd Nes <sigurdne>   07/02/13 19:52:04

Modified files:
        inc            : class.boetemplate.inc.php 
                         class.date_widget.inc.php 

Log message:
        notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.boetemplate.inc.php?cvsroot=phpgroupware&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.date_widget.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18

Patches:
Index: class.boetemplate.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.boetemplate.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- class.boetemplate.inc.php   13 Feb 2007 12:59:32 -0000      1.44
+++ class.boetemplate.inc.php   13 Feb 2007 19:52:04 -0000      1.45
@@ -5,7 +5,7 @@
 * @author Ralf Becker <address@hidden>
 * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public 
License
 * @package etemplate
-* @version $Id: class.boetemplate.inc.php,v 1.44 2007/02/13 12:59:32 sigurdne 
Exp $
+* @version $Id: class.boetemplate.inc.php,v 1.45 2007/02/13 19:52:04 sigurdne 
Exp $
 */
        include_once(PHPGW_INCLUDE_ROOT . 
'/etemplate/inc/class.soetemplate.inc.php');
 
@@ -377,11 +377,11 @@
                                                $this->data[$row][$col][$attr] 
= $val;
                                                ++$n;
                                        }
-                                       if (isset($cell['type']) && 
$cell['type'] == 'template' && isset($cell['obj']) && (is_object($cell['obj']) 
|| $cell['name'][0] != '@'))
+                                       if ($cell['type'] == 'template' && 
(isset($cell['obj']) && is_object($cell['obj']) || $cell['name'][0] != '@'))
                                        {
-                                               if (!is_object($cell['obj']))
+                                               if (!isset($cell['obj']) || 
!is_object($cell['obj']))
                                                {
-                                                       
$this->data[$row][$col]['obj'] = 
createObject('etemplate.etemplate',$cell['name']);
+                                                       
$this->data[$row][$col]['obj'] = 
CreateObject('etemplate.etemplate',$cell['name']);
                                                }
                                                $n += 
$this->data[$row][$col]['obj']->set_cell_attribute($name,$attr,$val);
                                        }

Index: class.date_widget.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.date_widget.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.date_widget.inc.php   13 Feb 2007 12:59:32 -0000      1.17
+++ class.date_widget.inc.php   13 Feb 2007 19:52:04 -0000      1.18
@@ -5,7 +5,7 @@
 * @author Ralf Becker <address@hidden>
 * @license http://www.gnu.org/licenses/gpl.html GNU General Public License
 * @package etemplate
-* @version $Id: class.date_widget.inc.php,v 1.17 2007/02/13 12:59:32 sigurdne 
Exp $
+* @version $Id: class.date_widget.inc.php,v 1.18 2007/02/13 19:52:04 sigurdne 
Exp $
 */
        /**
         * widget that reads a date and/or time 
@@ -228,7 +228,7 @@
                        {
                                return False;
                        }
-                       if ($value['today'])
+                       if (isset($value['today']) && $value['today'])
                        {
                                $set = array('Y','m','d');
                                foreach($set as $d)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]