diff options
| author | friendica <info@friendica.com> | 2015-01-10 13:05:04 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-10 13:05:04 -0800 |
| commit | df0f67843ea1fb492091806168d556d5a0c540c6 (patch) | |
| tree | ad2173743036e0e5ab349cf0a24e9c80edffa9b8 /mod | |
| parent | 072dc6e820e9f6f1a561e62e4873187bf25f19e8 (diff) | |
| parent | 8c4eb839f9cf224c920e5a0c45c22961cac62ce1 (diff) | |
| download | volse-hubzilla-df0f67843ea1fb492091806168d556d5a0c540c6.tar.gz volse-hubzilla-df0f67843ea1fb492091806168d556d5a0c540c6.tar.bz2 volse-hubzilla-df0f67843ea1fb492091806168d556d5a0c540c6.zip | |
Merge branch 'master' into trinidad
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()) { |