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

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

This commit is contained in:
Isaac Connor 2016-09-16 09:36:41 -04:00
parent 3dfe1185ff 5f46b8f942
commit 66ae5c52ae
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/skins/classic/views/control.php
View File

@ -48,8 +48,7 @@ foreach( dbFetchAll( $sql ) as $row )
foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile ) foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile )
require_once $includeFile; require_once $includeFile;
$sql = 'SELECT C.*,M.* FROM Monitors AS M INNER JOIN Controls AS C ON (M.ControlId = C.Id ) WHERE M.Id = ?'; $monitor = new Monitor( $mid );
$monitor = dbFetchOne( $sql, NULL, array( $mid ) );
$focusWindow = true; $focusWindow = true;