From d6fc2d0cd5b54e3330e6020b87bcbedd7f24010e Mon Sep 17 00:00:00 2001 From: stan Date: Sun, 3 Aug 2008 15:05:33 +0000 Subject: [PATCH] Fixed display or error page. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2614 e3e1d417-86f3-4887-817a-d78f3d33393f --- web/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/index.php b/web/index.php index b0a1bfb6e..c248dc7fc 100644 --- a/web/index.php +++ b/web/index.php @@ -103,6 +103,7 @@ if ( isset( $_REQUEST['request'] ) ) { foreach ( getSkinIncludes( 'ajax/'.$_REQUEST['request'].'.php', true, true ) as $includeFile ) require_once $includeFile; + return; } else { @@ -111,7 +112,7 @@ else foreach ( $includeFiles as $includeFile ) require_once $includeFile; } - else + if ( !$includeFiles || $_REQUEST['view'] == 'error' ) { foreach ( getSkinIncludes( 'views/error.php', true, true ) as $includeFile ) require_once $includeFile;