diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-23 19:04:42 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-23 19:04:42 -0700 |
| commit | 21b919a76b4bf229985f5ce3973590e95c8bc1bb (patch) | |
| tree | 37f13199d289893430c89fe7ab75d39263db3368 | |
| parent | 5fbba27d17c78081e784fc2f8e9bb1907b79b4b7 (diff) | |
| download | volse-hubzilla-21b919a76b4bf229985f5ce3973590e95c8bc1bb.tar.gz volse-hubzilla-21b919a76b4bf229985f5ce3973590e95c8bc1bb.tar.bz2 volse-hubzilla-21b919a76b4bf229985f5ce3973590e95c8bc1bb.zip | |
correct encoding
| -rw-r--r-- | include/attach.php | 2 | ||||
| -rw-r--r-- | include/photo/photo_driver.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/attach.php b/include/attach.php index e2e214ce3..b9c7ceb4a 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1912,7 +1912,7 @@ function attach_export_data($channel, $resource_id, $deleted = false) { ); if($r) { for($x = 0; $x < count($r); $x ++) { - $r[$x]['content'] = base64_encode($r[$x]['content']); + $r[$x]['content'] = base64_encode(dbunescbin($r[$x]['content'])); } $ret['photo'] = $r; } diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 87e4cbd0c..af4fd0a30 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -378,7 +378,7 @@ abstract class photo_driver { dbesc($p['album']), intval($this->getHeight()), intval($this->getWidth()), - (intval($p['os_storage']) ? dbesc($p['os_path']) : dbescbin($this->imageString())), + (intval($p['os_storage']) ? dbescbin($p['os_path']) : dbescbin($this->imageString())), intval($p['os_storage']), intval(strlen($this->imageString())), intval($p['imgscale']), @@ -409,7 +409,7 @@ abstract class photo_driver { dbesc($p['album']), intval($this->getHeight()), intval($this->getWidth()), - (intval($p['os_storage']) ? dbesc($p['os_path']) : dbescbin($this->imageString())), + (intval($p['os_storage']) ? dbescbin($p['os_path']) : dbescbin($this->imageString())), intval($p['os_storage']), intval(strlen($this->imageString())), intval($p['imgscale']), |