aboutsummaryrefslogtreecommitdiffstats
path: root/mod/item.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-02-17 16:21:22 -0800
committerredmatrix <git@macgirvin.com>2016-02-17 16:21:22 -0800
commit3a84e7051e70ac9c26ec705155ac4020d9a64f62 (patch)
tree7d40629aa9fdcd73488da01e60acf90a441688a1 /mod/item.php
parent161050df074bffdacf9fc39f042d17dd84f63ee5 (diff)
parent62e141a89c1e2c5583718690ea83a13dd1d23dd1 (diff)
downloadvolse-hubzilla-3a84e7051e70ac9c26ec705155ac4020d9a64f62.tar.gz
volse-hubzilla-3a84e7051e70ac9c26ec705155ac4020d9a64f62.tar.bz2
volse-hubzilla-3a84e7051e70ac9c26ec705155ac4020d9a64f62.zip
Merge branch 'iconfig'
Diffstat (limited to 'mod/item.php')
-rw-r--r--mod/item.php10
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'",