Fixed display or error page.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2614 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-08-03 15:05:33 +00:00 · 2008-08-03 15:05:33 +00:00 · d6fc2d0cd5
parent bb2f87a6f0
commit d6fc2d0cd5
1 changed files with 2 additions and 1 deletions
--- 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;