ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3915 from Simpler1/patch-6 

chore(lint): $ locations
pull/3918/head
Isaac Connor 2024-03-28 10:17:12 -04:00 committed by GitHub
parent f624ad08f2 992b729329
commit b7baab3394
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/includes/Event.php
View File

@ -801,13 +801,13 @@ class Event extends ZM_Object {
$width = $this->Width();
$height = $this->Height();
$video_size = " ${width}x${height}";
$video_size = " {$width}x{$height}";
if ( $scale ) {
if ( $scale != 1.0 ) {
$width = int($width*$scale);
$height = int($height*$scale);
$video_size = " ${width}x${height}";
$video_size = " {$width}x{$height}";
}
} else if ( $size ) {
$video_size = $size;
@ -833,7 +833,7 @@ class Event extends ZM_Object {
Info("Finished $video_file");
return $video_file;
} else {
Info("Video file $video_file already exists for event ${this['Id']}");
Info("Video file $video_file already exists for event {$this['Id']}");
return $video_file;
}
return;