Skip to content
Permalink
Browse files
Merge pull request #673 from kvazimoda24/patch-1
Скриншоты с камеры при работе из подкаталога.
  • Loading branch information
sergejey committed Jan 30, 2020
2 parents 6e01078 + 56d0c8e commit 817e22d6e4427bbcc6e6e6a3275e167ea713a7c2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
@@ -32,6 +32,10 @@
} else {
$snapshotPreviewURL='';
}
$rootHTML=preg_replace('/\//', '\/', ROOTHTML);
if (preg_match('/^' . $rootHTML . '/', $snapshotPreviewURL)) {
$snapshotPreviewURL=preg_replace('/^' . $rootHTML . '/', '/', $snapshotPreviewURL);
}
$image_url=BASE_URL.$snapshotPreviewURL;

$new_width = 500;
@@ -88,4 +92,4 @@
$value=ROOT.'cms/images/'.$value;
}

return $value;
return $value;
@@ -32,10 +32,14 @@
} else {
$snapshotPreviewURL='';
}
$rootHTML=preg_replace('/\//', '\/', ROOTHTML);
if (preg_match('/^' . $rootHTML . '/', $snapshotPreviewURL)) {
$snapshotPreviewURL=preg_replace('/^' . $rootHTML . '/', '/', $snapshotPreviewURL);
}
$image_url=BASE_URL.$snapshotPreviewURL;

//echo $image_url."!";
if ($image_url!='') {
$this->setProperty('snapshot',$image_url);
$this->setProperty('updated',time());
}
}

0 comments on commit 817e22d

Please sign in to comment.