mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-09 01:19:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

braes

Browse Source
This commit is contained in:
Isaac Connor
2018-01-25 09:13:31 -08:00
parent 703cd332df
commit 2ea2f46ec8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/includes/functions.php
View File

@@ -2132,10 +2132,11 @@ function ajaxResponse( $result=false ) {
if ( function_exists( 'ajaxCleanup' ) )
ajaxCleanup();
$response = array( 'result'=>'Ok' );
if ( is_array( $result ) )
if ( is_array( $result ) ) {
$response = array_merge( $response, $result );
elseif ( !empty($result) )
} elseif ( !empty($result) ) {
$response['message'] = $result;
}
header( 'Content-type: text/plain' );
exit( jsonEncode( $response ) );
}