The item id is now stored in every notification as well

diff --git a/boot.php b/boot.php
index 5e0a70db1f748ee625b76cd2ff5195f18960fc68..5994b2030ac21c5aa2c045ade6bcb0524758c945 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -18,7 +18,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
 define ( 'FRIENDICA_VERSION',      '3.4.0' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1183      );
+define ( 'DB_UPDATE_VERSION',      1184      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 083255b8ae87ae4baf9ca612ec43c57500006922..354c06a43e9ff2c4b18da5fa03fb8f74bee6688c 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -925,6 +925,7 @@ function db_definition() {
                                        "msg" => array("type" => "mediumtext", "not null" => "1"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+                                       "iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "parent" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),

diff --git a/include/enotify.php b/include/enotify.php
index 4316188506f1cebb18c1fefa435c96c04aa90db9..027293d4f3a9b3c957046cb6f415c55ce2bf5750 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -27,7 +27,7 @@ function notification($params) {
        $hostname = $a->get_hostname();
        if(strpos($hostname,':'))
                $hostname = substr($hostname,0,strpos($hostname,':'));
-       
+
        $sender_email = $a->config['sender_email'];
        if (empty($sender_email)) {
                $sender_email = t('noreply') . '@' . $hostname;
@@ -63,6 +63,11 @@ function notification($params) {
        // e.g. "your post", "David's photo", etc.
        $possess_desc = t('%s <!item_type!>');
 
+       if (isset($params['item']['id']))
+               $item_id = $params['item']['id'];
+       else
+               $item_id = 0;
+
        if (isset($params['parent']))
                $parent_id = $params['parent'];
        else
@@ -405,6 +410,7 @@ function notification($params) {
                $datarray['date']  = datetime_convert();
                $datarray['uid']   = $params['uid'];
                $datarray['link']  = $itemlink;
+               $datarray['iid']   = $item_id;
                $datarray['parent'] = $parent_id;
                $datarray['type']  = $params['type'];
                $datarray['verb']  = $params['verb'];
@@ -420,8 +426,8 @@ function notification($params) {
 
                // create notification entry in DB
 
-               $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype)
-                       values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')",
+               $r = q("insert into notify (hash,name,url,photo,date,uid,link,iid,parent,type,verb,otype)
+                       values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,%d,'%s','%s')",
                        dbesc($datarray['hash']),
                        dbesc($datarray['name']),
                        dbesc($datarray['url']),
@@ -429,6 +435,7 @@ function notification($params) {
                        dbesc($datarray['date']),
                        intval($datarray['uid']),
                        dbesc($datarray['link']),
+                       intval($datarray['iid']),
                        intval($datarray['parent']),
                        intval($datarray['type']),
                        dbesc($datarray['verb']),

diff --git a/update.php b/update.php
index 35aaff2c064eec7a9ed0cdb20e748ffb51dc63b1..ca86c8557e494b5328af2c93fb1db3fa405b1781 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1183 );
+define( 'UPDATE_VERSION' , 1184 );
 
 /**
  *