You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2014/12/22 21:05:29 UTC

svn commit: r1647392 - /vcl/trunk/web/.ht-inc/utils.php

Author: jfthomps
Date: Mon Dec 22 20:05:28 2014
New Revision: 1647392

URL: http://svn.apache.org/r1647392
Log:
VCL-780 - combine new reservation and current reservations pages

utils.php: modified menulistLI: added check for $obj->restype being set before referencing it

Modified:
    vcl/trunk/web/.ht-inc/utils.php

Modified: vcl/trunk/web/.ht-inc/utils.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1647392&r1=1647391&r2=1647392&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Mon Dec 22 20:05:28 2014
@@ -12299,7 +12299,7 @@ function menulistLI($page) {
 	$testval = $actions['pages'][$mymode];
 	if($inContinuation) {
 		$obj = getContinuationVar('obj');
-		if(! is_null($obj))
+		if(! is_null($obj) && isset($obj->restype))
 			$testval = $obj->restype;
 	}
 	if($testval == $page)