diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-18 20:33:25 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-18 20:33:25 +0100 |
| commit | cc264b2d60049a844fe17322fbcb367712a7071f (patch) | |
| tree | f1f069a49dd186d4cf21c37a25fb794d6d53e6f2 /mod/item.php | |
| parent | b77c5ae61e5a208daf4b9431a730db874c487e32 (diff) | |
| parent | 33c34984e647f48452d53b93b635f6f517a0f392 (diff) | |
| download | volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.gz volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.bz2 volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php index fdc768c67..d861967a9 100644 --- a/mod/item.php +++ b/mod/item.php @@ -233,6 +233,8 @@ function item_post(&$a) { $post_id = $i[0]['iid']; } + $iconfig = null; + if($post_id) { $i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1", intval($profile_uid), @@ -241,6 +243,9 @@ function item_post(&$a) { if(! count($i)) killme(); $orig_post = $i[0]; + $iconfig = q("select * from iconfig where iid = %d", + intval($post_id) + ); } @@ -792,6 +797,9 @@ function item_post(&$a) { $datarray['plink'] = $plink; $datarray['route'] = $route; + if($iconfig) + $datarray['iconfig'] = $iconfig; + // preview mode - prepare the body for display and send it via json if($preview) { @@ -808,8 +816,6 @@ function item_post(&$a) { if($orig_post) $datarray['edit'] = true; - - if(feature_enabled($profile_uid,'suppress_duplicates') && (! $orig_post)) { $z = q("select created from item where uid = %d and body = '%s'", |