aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-11-11 13:49:29 +0100
committerMario <mario@mariovavti.com>2018-11-11 13:49:29 +0100
commite47a96bf247322fa12b5543c42cf69519039c1c3 (patch)
tree223ff778be767c230abda7e5c83f62776a8b84ee /include
parentdaad607c7c4cb1efe83bbf817854311cee9d19af (diff)
parent29f1f9c8727f281b52fed76ce4be0c5c66a7d038 (diff)
downloadvolse-hubzilla-e47a96bf247322fa12b5543c42cf69519039c1c3.tar.gz
volse-hubzilla-e47a96bf247322fa12b5543c42cf69519039c1c3.tar.bz2
volse-hubzilla-e47a96bf247322fa12b5543c42cf69519039c1c3.zip
Merge branch 'dev' into 'dev'
Preserve photo modification date on edit See merge request hubzilla/core!1389
Diffstat (limited to 'include')
-rw-r--r--include/photo/photo_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index cced7bf03..4173d727e 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -637,7 +637,7 @@ function import_xchan_photo($photo,$xchan,$thing = false,$force = false) {
if(is_null($type))
$photo_failure = true;
}
- elseif($result['return_code'] === 304) {
+ elseif($result['return_code'] == 304) {
$photo = z_root() . '/photo/' . $hash . '-4';
$thumb = z_root() . '/photo/' . $hash . '-5';
$micro = z_root() . '/photo/' . $hash . '-6';