mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-05 21:23:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mysql2PDO

Browse Source
This commit is contained in:
Isaac Connor
2013-10-17 17:02:44 -04:00
parent 60e2703637 355c10c3a4
commit ef765afa2d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/includes/functions.php
View File

@@ -648,7 +648,7 @@ function buildSelect( $name, $contents, $behaviours=false )
foreach ( $contents as $contentValue => $contentText )
{
?>
<option value="<?= $contentValue ?>"<?php if ( $value == $contentValue ) { ?> selected="selected"<? } ?>><?= validHtmlStr($contentText) ?></option>
<option value="<?= $contentValue ?>"<?php if ( $value == $contentValue ) { ?> selected="selected"<?php } ?>><?= validHtmlStr($contentText) ?></option>
<?php
}
?>

6
web/skins/classic/views/event.php
View File

@@ -59,8 +59,10 @@ if ( isset( $_REQUEST['replayMode'] ) )
$replayMode = validHtmlStr($_REQUEST['replayMode']);
if ( isset( $_COOKIE['replayMode']) && preg_match('#^[a-z]+$#', $_COOKIE['replayMode']) )
$replayMode = validHtmlStr($_COOKIE['replayMode']);
else
$replayMode = array_shift( array_keys( $replayModes ) );
else {
$keys = array_keys( $replayModes );
$replayMode = array_shift( $keys );
}
parseSort();
parseFilter( $_REQUEST['filter'] );