diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-10 15:10:09 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-10 15:10:09 -0500 |
| commit | a4de63ca923583b77cf2a4ad60f4893e006f90e4 (patch) | |
| tree | 31406e7dffabc54d2b49879272598236949793c7 /Zotlabs/Module/Cover_photo.php | |
| parent | 9b13db1c4896e6a8b0a55195530f5449999e811d (diff) | |
| parent | 78040330b6be3681dd0d6fdd1d3d0960fd88bc06 (diff) | |
| download | volse-hubzilla-a4de63ca923583b77cf2a4ad60f4893e006f90e4.tar.gz volse-hubzilla-a4de63ca923583b77cf2a4ad60f4893e006f90e4.tar.bz2 volse-hubzilla-a4de63ca923583b77cf2a4ad60f4893e006f90e4.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'Zotlabs/Module/Cover_photo.php')
| -rw-r--r-- | Zotlabs/Module/Cover_photo.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 047bcf3d4..56e35f912 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -207,7 +207,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { } } - $imagedata = (($os_storage) ? @file_get_contents($imagedata) : $imagedata); + $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata)); $ph = photo_factory($imagedata, $filetype); if(! $ph->is_valid()) { @@ -364,6 +364,12 @@ class Cover_photo extends \Zotlabs\Web\Controller { '$embedPhotosModalTitle' => t('Use a photo from your albums'), '$embedPhotosModalCancel' => t('Cancel'), '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), '$form_security_token' => get_form_security_token("cover_photo"), /// @FIXME - yuk '$select' => t('Select existing photo'), |