harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct encoding

Browse Source
This commit is contained in:
zotlabs 2016-10-23 19:04:42 -07:00
parent 5fbba27d17
commit 21b919a76b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/attach.php
View File

@ -1912,7 +1912,7 @@ function attach_export_data($channel, $resource_id, $deleted = false) {
); );
if($r) { if($r) {
for($x = 0; $x < count($r); $x ++) { 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; $ret['photo'] = $r;
} }

4
include/photo/photo_driver.php
View File

@ -378,7 +378,7 @@ abstract class photo_driver {
dbesc($p['album']), dbesc($p['album']),
intval($this->getHeight()), intval($this->getHeight()),
intval($this->getWidth()), 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($p['os_storage']),
intval(strlen($this->imageString())), intval(strlen($this->imageString())),
intval($p['imgscale']), intval($p['imgscale']),
@ -409,7 +409,7 @@ abstract class photo_driver {
dbesc($p['album']), dbesc($p['album']),
intval($this->getHeight()), intval($this->getHeight()),
intval($this->getWidth()), 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($p['os_storage']),
intval(strlen($this->imageString())), intval(strlen($this->imageString())),
intval($p['imgscale']), intval($p['imgscale']),