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

fix merge

This commit is contained in:
Isaac Connor 2017-07-06 12:41:15 -04:00
parent 2a71b0f170
commit 323aedde4e
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_eventstream.cpp
View File

@ -38,11 +38,6 @@
#include "zm_storage.h" #include "zm_storage.h"
#include "zm_monitor.h" #include "zm_monitor.h"
<<<<<<< HEAD
=======
// sendfile tricks
extern "C" {
>>>>>>> storageareas
#include "zm_sendfile.h" #include "zm_sendfile.h"
bool EventStream::loadInitialEventData( int monitor_id, time_t event_time ) { bool EventStream::loadInitialEventData( int monitor_id, time_t event_time ) {
@ -142,10 +137,7 @@ bool EventStream::loadEventData( int event_id ) {
event_data->start_time = atoi(dbrow[3]); event_data->start_time = atoi(dbrow[3]);
event_data->duration = atof(dbrow[4]); event_data->duration = atof(dbrow[4]);
strncpy( event_data->video_file, dbrow[5], sizeof( event_data->video_file )-1 ); strncpy( event_data->video_file, dbrow[5], sizeof( event_data->video_file )-1 );
<<<<<<< HEAD
mysql_free_result( result ); mysql_free_result( result );
=======
>>>>>>> storageareas
Storage * storage = new Storage( event_data->storage_id ); Storage * storage = new Storage( event_data->storage_id );
const char *storage_path = storage->Path(); const char *storage_path = storage->Path();

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

@ -147,7 +147,6 @@ if ( (null !== $filter->Concurrent()) and $filter->Concurrent() )
<table id="fieldsTable" class="filterTable"> <table id="fieldsTable" class="filterTable">
<tbody> <tbody>
<?php <?php
var_dump($terms);
for ( $i = 0; $i < count($terms); $i++ ) { for ( $i = 0; $i < count($terms); $i++ ) {
$term = $terms[$i]; $term = $terms[$i];
if ( ! isset( $term['op'] ) ) if ( ! isset( $term['op'] ) )