update author name across items if changed.

diff --git a/boot.php b/boot.php
index 4dd16c940da72777e52752ec54ec5c7cc76e3a0b..0815f59f6873e5d8ba0697a7e8758aac9a92f5a5 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1262' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1124      );
+define ( 'DB_UPDATE_VERSION',      1125      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index e051cdaac5c611d031dfb4725ce9cf43e1d09d58..f4199cb55a1f553b6ff208379d7d3ba5b16acdc9 100755 (executable)
--- a/database.sql
+++ b/database.sql
@@ -257,6 +257,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `last-child` (`last-child`),
   KEY `unseen` (`unseen`),
   KEY `wall` (`wall`),
+  KEY `author-name` (`author-name`),
   KEY `author-link` (`author-link`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),

diff --git a/include/items.php b/include/items.php
index ba4ec036fe2045d2ce3d207391f1d54bda203f9b..de3ade6b4e517aa8246418f049f9c1720c2b8e93 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -1308,12 +1308,28 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
        }
 
        if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
-               q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+               $r = q("select * from contact where uid = %d and id = %d limit 1",
+                       intval($contact['uid']),
+                       intval($contact['id'])
+               );
+
+               $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
                        dbesc(notags(trim($new_name))),
                        dbesc(datetime_convert()),
                        intval($contact['uid']),
                        intval($contact['id'])
                );
+
+               // do our best to update the name on content items
+
+               if(count($r)) {
+                       q("update item set `author-name` = '%s' where `author-name` = '%s' and `author-link` = '%s' and uid = %d",
+                               dbesc(notags(trim($new_name))),
+                               dbesc($r[0]['name']),
+                               dbesc($r[0]['url']),
+                               intval($contact['uid'])
+                       );
+               }
        }
 
        if(strlen($birthday)) {

diff --git a/update.php b/update.php
index 07555bc01943692c98526acd2ccc1cb6641fe917..0096754d20afda75b19230946c5ee64e24788f9f 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1124 );
+define( 'UPDATE_VERSION' , 1125 );
 
 /**
  *
@@ -1073,3 +1073,7 @@ ADD INDEX ( `hash` ) ");
 function update_1123() {
 set_config('system','allowed_themes','dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr');
 }
+
+function update_1124() {
+q("alter table item add index (`author-name`) ");
+}
\ No newline at end of file