[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.menu.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] property/inc class.menu.inc.php |
Date: |
Fri, 24 Nov 2006 10:43:50 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/11/24 10:43:50
Modified files:
inc : class.menu.inc.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.menu.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
Patches:
Index: class.menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.menu.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- class.menu.inc.php 23 Nov 2006 14:42:26 -0000 1.33
+++ class.menu.inc.php 24 Nov 2006 10:43:50 -0000 1.34
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.menu.inc.php,v 1.33 2006/11/23 14:42:26 sigurdne
Exp $
+ * @version $Id: class.menu.inc.php,v 1.34 2006/11/24 10:43:50 sigurdne
Exp $
*/
/**
@@ -42,7 +42,7 @@
// $menu =
$GLOBALS['phpgw']->session->appsession('menu',substr(md5($currentapp.$sub . '_'
. $page . '_' . $page_2),-20));
}
//_debug_array($page);
- if(!$menu)
+ if(!isset($menu) || !$menu)
{
$this->acl =
CreateObject('phpgwapi.acl');
@@ -176,11 +176,12 @@
$soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
$location =
$soadmin_location->select_location_type();
$query_temp =
explode('-',$this->query);
+ $query_location = '';
$location_count=count($location);
for ($j=0; $j<$location_count;
$j++)
{
- if($query_temp[$j])
+
if(isset($query_temp[$j]) && $query_temp[$j])
{
$query[] =
$query_temp[$j];
$query_location
= implode('-',$query);
- [Phpgroupware-cvs] property/inc class.menu.inc.php,
Sigurd Nes <=