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

Merge branch 'release-1.34'

This commit is contained in:
Isaac Connor 2021-04-12 16:32:57 -04:00
parent 3921231cd5 a341d2ef84
commit 95249d5eb4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/do_debian_package.sh
View File

@ -300,7 +300,7 @@ EOF
DEBUILD="debuild -i -us -uc -b" DEBUILD="debuild -i -us -uc -b"
else else
# Source build, don't need build depends. # Source build, don't need build depends.
DEBUILD="debuild -S -sa" DEBUILD="debuild -S -sa -sd"
fi; fi;
fi; fi;
if [ "$DEBSIGN_KEYID" != "" ]; then if [ "$DEBSIGN_KEYID" != "" ]; then

2
web/includes/actions/settings.php
View File

@ -29,7 +29,7 @@ if ( ! canView('Control', $_REQUEST['mid']) ) {
return; return;
} }
require_once('Monitor.php'); require_once('includes/Monitor.php');
$mid = validInt($_REQUEST['mid']); $mid = validInt($_REQUEST['mid']);
if ( $action == 'settings' ) { if ( $action == 'settings' ) {
$args = ' -m ' . escapeshellarg($mid); $args = ' -m ' . escapeshellarg($mid);