bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Rename Term methods ahead of the move

Browse source 
- Rename createFromItemURI() to insertFromItemFileByUri()
- Rename createFromItem() to insertFromItemFileById()
This commit is contained in:
Hypolite Petovan 2018-02-03 22:42:31 -05:00
commit 0abe4158d2
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/text.php
View file

@ -1901,7 +1901,7 @@ function file_tag_save_file($uid, $item, $file)
);
}
Term::createFromItem($item);
Term::insertFromItemFileById($item);
$saved = PConfig::get($uid, 'system', 'filetags');
if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) {
@ -1940,7 +1940,7 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false)
intval($uid)
);
Term::createFromItem($item);
Term::insertFromItemFileById($item);
$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
dbesc($file),

6
src/Model/Item.php
View file

@ -71,7 +71,7 @@ class Item extends BaseObject
}
create_tags_from_item($item['id']);
Term::createFromItem($item['id']);
Term::insertFromItemFileById($item['id']);
update_thread($item['id']);
Worker::add(PRIORITY_HIGH, "Notifier", 'edit_post', $item['id']);
@ -153,7 +153,7 @@ class Item extends BaseObject
['id' => $item['id']]);
create_tags_from_item($item['id']);
Term::createFromItem($item['id']);
Term::insertFromItemFileById($item['id']);
delete_thread($item['id'], $item['parent-uri']);
// If it's the parent of a comment thread, kill all the kids
@ -792,7 +792,7 @@ class Item extends BaseObject
* This is not perfect - but a workable solution until we found the reason for the problem.
*/
create_tags_from_item($current_post);
Term::createFromItem($current_post);
Term::insertFromItemFileById($current_post);
if ($arr['parent-uri'] === $arr['uri']) {
self::addShadow($current_post);

9
src/Model/Term.php
View file

@ -4,6 +4,7 @@
*/
namespace Friendica\Model;
use Friendica\Database\DBM;
use dba;
require_once "include/dba.php";
@ -14,10 +15,10 @@ class Term
* @param integer $itemid item id
* @return void
*/
public static function createFromItem($itemid)
public static function insertFromItemFileById($itemid)
{
$message = dba::selectFirst('item', ['uid', 'deleted', 'file'], ['id' => $itemid]);
if (!\Friendica\Database\DBM::is_result($message)) {
if (!DBM::is_result($message)) {
return;
}
@ -62,13 +63,13 @@ class Term
* @param integer $uid uid
* @return void
*/
public static function createFromItemURI($itemuri, $uid)
public static function insertFromItemFileByUri($itemuri, $uid)
{
$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
if (count($messages)) {
foreach ($messages as $message) {
self::createFromItem($message["id"]);
self::insertFromItemFileById($message["id"]);
}
}
}

4
src/Protocol/DFRN.php
View file

@ -2841,7 +2841,7 @@ class DFRN
intval($importer["uid"])
);
create_tags_from_itemuri($uri, $importer["uid"]);
Term::createFromItemURI($uri, $importer["uid"]);
Term::insertFromItemFileByUri($uri, $importer["uid"]);
update_thread_uri($uri, $importer["uid"]);
} else {
$r = q(
@ -2854,7 +2854,7 @@ class DFRN
intval($importer["uid"])
);
create_tags_from_itemuri($uri, $importer["uid"]);
Term::createFromItemURI($uri, $importer["uid"]);
Term::insertFromItemFileByUri($uri, $importer["uid"]);
update_thread_uri($uri, $importer["importer_uid"]);
// if this is a relayed delete, propagate it to other recipients