ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'iconnor-updated-console' into storageareas

This commit is contained in:
Isaac Connor 2016-05-06 11:56:24 -04:00
parent be4f155160 8405db4750
commit 44e5b566b8
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/index.php
View File

@ -138,6 +138,7 @@ else
require_once( 'includes/lang.php' ); require_once( 'includes/lang.php' );
require_once( 'includes/functions.php' ); require_once( 'includes/functions.php' );
$running = daemonCheck();
# Add Cross domain access headers # Add Cross domain access headers
CORSHeaders(); CORSHeaders();

1
web/skins/classic/views/header.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
$running = daemonCheck();
$states = dbFetchAll( "select * from States" ); $states = dbFetchAll( "select * from States" );
$status = $running?translate('Running'):translate('Stopped'); $status = $running?translate('Running'):translate('Stopped');
$run_state = dbFetchOne('select Name from States where IsActive = 1', 'Name' ); $run_state = dbFetchOne('select Name from States where IsActive = 1', 'Name' );