diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-08-26 14:44:24 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-08-26 14:44:24 +0200 |
| commit | 5ec4a4e6deb5d28cbfab54093f8b4180912738d4 (patch) | |
| tree | 653cb4738734d9f20bd1457c419105dcf235edea /include/Photo.php | |
| parent | 97806544bcd7ee3831ffc515062afe0812828b76 (diff) | |
| parent | 1861dc1fae549a0ee2b6287d4f7dc7f8797f5070 (diff) | |
| download | volse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.tar.gz volse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.tar.bz2 volse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'include/Photo.php')
| -rw-r--r-- | include/Photo.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/Photo.php b/include/Photo.php index de4c3d9e0..1450374ff 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -185,11 +185,20 @@ class Photo { public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') { + $r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1", + dbesc($rid) + ); + if(count($r)) + $guid = $r[0]['guid']; + else + $guid = get_guid(); + $r = q("INSERT INTO `photo` - ( `uid`, `contact-id`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) - VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", + ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) + VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", intval($uid), intval($cid), + dbesc($guid), dbesc($rid), dbesc(datetime_convert()), dbesc(datetime_convert()), |