phpgroupware-cvs
[Top][All Lists]
Advanced

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

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


From: Sigurd Nes
Subject: [Phpgroupware-cvs] phpgwapi inc/class.nextmatchs.inc.php inc/class...
Date: Sat, 25 Nov 2006 10:12:32 +0000

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/11/25 10:12:32

Modified files:
        inc            : class.nextmatchs.inc.php 
                         class.preferences.inc.php 
        templates/verdilak: head.inc.php 

Log message:
        notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.nextmatchs.inc.php?cvsroot=phpgwapi&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.preferences.inc.php?cvsroot=phpgwapi&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/verdilak/head.inc.php?cvsroot=phpgwapi&r1=1.23&r2=1.24

Patches:
Index: inc/class.nextmatchs.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- inc/class.nextmatchs.inc.php        13 Nov 2006 12:47:06 -0000      1.81
+++ inc/class.nextmatchs.inc.php        25 Nov 2006 10:12:32 -0000      1.82
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.nextmatchs.inc.php,v 1.81 2006/11/13 12:47:06 ceb 
Exp $
+       * @version $Id: class.nextmatchs.inc.php,v 1.82 2006/11/25 10:12:32 
sigurdne Exp $
        */
 
        /**
@@ -481,7 +481,7 @@
                        {
                                $params         = $search_obj;
                                $_query = stripslashes($params['query']);
-                               $search_obj = $params['search_obj'];
+                               $search_obj = 
(isset($params['search_obj'])?$params['search_obj']:'');
                        }
                        else
                        {

Index: inc/class.preferences.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.preferences.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- inc/class.preferences.inc.php       2 Oct 2006 10:11:00 -0000       1.66
+++ inc/class.preferences.inc.php       25 Nov 2006 10:12:32 -0000      1.67
@@ -7,7 +7,7 @@
         * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
         * @package phpgwapi
         * @subpackage application
-        * @version $Id: class.preferences.inc.php,v 1.66 2006/10/02 10:11:00 
skwashd Exp $
+        * @version $Id: class.preferences.inc.php,v 1.67 2006/11/25 10:12:32 
sigurdne Exp $
         */
 
        /**
@@ -721,7 +721,7 @@
                        }
                        if ($preferences_update)
                        {
-                               $this->update_data($user_prefs);
+                       //      $this->update_data($user_prefs); // doing 
nothing?
                                $this->save_repository();
                                $GLOBALS['phpgw_info']['preferences'] = 
$this->read_repository();
                        }

Index: templates/verdilak/head.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/verdilak/head.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- templates/verdilak/head.inc.php     28 Sep 2006 12:48:08 -0000      1.23
+++ templates/verdilak/head.inc.php     25 Nov 2006 10:12:32 -0000      1.24
@@ -5,7 +5,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: head.inc.php,v 1.23 2006/09/28 12:48:08 skwashd Exp $
+       * @version $Id: head.inc.php,v 1.24 2006/11/25 10:12:32 sigurdne Exp $
        */
        
        if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
@@ -21,7 +21,7 @@
        $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
 
        $theme_styles[] = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/verdilak/css/base.css";
-       if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/verdilak/css/' 
. $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
+       
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']) && 
file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/verdilak/css/' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
        {
                $theme_styles[] = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/verdilak/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
        }




reply via email to

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