[Phpgroupware-cvs] notes inc/class.sonotes.inc.php index.php [Version-0_9_16-branch]

[Dave Hall]

CVSROOT:        /sources/phpgroupware
Module name:    notes
Branch:         Version-0_9_16-branch
Changes by:     Dave Hall <skwashd>     06/10/24 13:53:14

Modified files:
        inc            : class.sonotes.inc.php 
        .              : index.php 

Log message:
        applying patch #5435 - php5 fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/notes/inc/class.sonotes.inc.php?cvsroot=phpgroupware&only_with_tag=Version-0_9_16-branch&r1=1.10.2.2&r2=1.10.2.3
http://cvs.savannah.gnu.org/viewcvs/notes/index.php?cvsroot=phpgroupware&only_with_tag=Version-0_9_16-branch&r1=1.48.4.1&r2=1.48.4.2

Patches:
Index: inc/class.sonotes.inc.php
===================================================================
RCS file: /sources/phpgroupware/notes/inc/class.sonotes.inc.php,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -b -r1.10.2.2 -r1.10.2.3
--- inc/class.sonotes.inc.php   9 Mar 2004 17:15:36 -0000       1.10.2.2
+++ inc/class.sonotes.inc.php   24 Oct 2006 13:53:14 -0000      1.10.2.3
@@ -12,14 +12,13 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
-       /* $Id: class.sonotes.inc.php,v 1.10.2.2 2004/03/09 17:15:36 ceb Exp $ 
*/
+       /* $Id: class.sonotes.inc.php,v 1.10.2.3 2006/10/24 13:53:14 skwashd 
Exp $ */
 
        class sonotes
        {
                var $grants;
                var $db;
                var $db2;
-               var $grants;
                var $owner;
                var $total_records;
 

Index: index.php
===================================================================
RCS file: /sources/phpgroupware/notes/index.php,v
retrieving revision 1.48.4.1
retrieving revision 1.48.4.2
diff -u -b -r1.48.4.1 -r1.48.4.2
--- index.php   4 Nov 2003 15:06:35 -0000       1.48.4.1
+++ index.php   24 Oct 2006 13:53:14 -0000      1.48.4.2
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: index.php,v 1.48.4.1 2003/11/04 15:06:35 ceb Exp $ */
+       /* $Id: index.php,v 1.48.4.2 2006/10/24 13:53:14 skwashd Exp $ */
 
        $GLOBALS['phpgw_info']['flags'] = array
        (
@@ -19,6 +19,10 @@
        );
        include('../header.inc.php');
 
+       // Workaround - ensure asyncservice class has been included BEFORE
+       // sonotes class is loaded
+       CreateObject('phpgwapi.asyncservice');
+
        $obj = CreateObject('notes.uinotes');
        $obj->_list();
        $GLOBALS['phpgw']->common->phpgw_footer();