diff options
| author | friendica <info@friendica.com> | 2015-01-10 13:05:02 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-10 13:05:02 -0800 |
| commit | 8c4eb839f9cf224c920e5a0c45c22961cac62ce1 (patch) | |
| tree | d14015aff61323899803c2d5a4afb99d891a3770 /mod | |
| parent | c75cdbd304d493feef25ae73dbfd0b9ee39f9fd5 (diff) | |
| parent | 50bc43733febf2aaea62d0d58c9537d2c63d74ce (diff) | |
| download | volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.tar.gz volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.tar.bz2 volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/mood.php | 2 | ||||
| -rw-r--r-- | mod/profile_photo.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mod/mood.php b/mod/mood.php index ff765fcac..e6f4760e0 100755 --- a/mod/mood.php +++ b/mod/mood.php @@ -137,4 +137,4 @@ function mood_content(&$a) { return $o; -}
\ No newline at end of file +} diff --git a/mod/profile_photo.php b/mod/profile_photo.php index e9dad6f51..13d3cd756 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -130,6 +130,7 @@ function profile_photo_post(&$a) { if($r) { $base_image = $r[0]; + $base_image['data'] = dbunescbin($base_image['data']); $im = photo_factory($base_image['data'], $base_image['type']); if($im->is_valid()) { |