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

This commit is contained in:
Isaac Connor 2021-12-16 09:35:31 -05:00
commit 3f3f607a6a
1 changed files with 1 additions and 1 deletions

View File

@ -102,7 +102,7 @@ var labels = new Array();
$labels = array(); $labels = array();
foreach (dbFetchAll('SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array($monitor->Id())) as $row) { foreach (dbFetchAll('SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array($monitor->Id())) as $row) {
$label = $labels[$row['Preset']] = $row['Label']; $label = $labels[$row['Preset']] = $row['Label'];
echo 'labels['. validInt($index) .'] = '.validJsStr($label).'\''; echo 'labels['. validInt($index) .'] = \''.validJsStr($label).'\'';
} }
?> ?>
var deleteString = "<?php echo translate('Delete') ?>"; var deleteString = "<?php echo translate('Delete') ?>";