harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2015-01-23 03:27:14 -08:00
commit 7cd4374e3d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/ping.php
View File

@ -229,7 +229,7 @@ function ping_init(&$a) {
foreach($z as $zz) {
$notifs[] = array(
'notify_link' => $a->get_baseurl() . '/notify/view/' . $zz['id'],
'name' => '', // not required here because the name is in the message
'name' => $zz['name'],
'url' => $zz['url'],
'photo' => $zz['photo'],
'when' => relative_date($zz['date']),

11
mod/sharedwithme.php
View File

@ -12,7 +12,7 @@ function sharedwithme_content(&$a) {
$is_owner = (local_user() && (local_user() == $channel['channel_id']));
//maintenance - see if a file got dropped and remove it systemwide
//maintenance - see if a file got dropped and remove it systemwide - this should possibly go to include/poller
$x = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d",
dbesc(ACTIVITY_UPDATE),
dbesc(ACTIVITY_OBJ_FILE),
@ -26,18 +26,21 @@ function sharedwithme_content(&$a) {
$object = json_decode($xx['object'],true);
$hash = $object['hash'];
//If object has a mid it's an update - the inlcuded mid is the latest and should not be removed
//If object has a mid it's an update activity - the inlcuded mid is the latest and should not be removed
$update = (($object['mid']) ? true : false);
if($update) {
$mid = $object['mid'];
$y = q("DELETE FROM item WHERE (mid != '%s' AND obj_type = '%s' AND object LIKE '%s') AND (verb = '%s' OR verb = '%s')",
unset($object['mid']); //remove mid from object to match the post activity object
$y = q("DELETE FROM item WHERE (mid != '%s' AND obj_type = '%s') AND (object = '%s' AND verb = '%s') OR (object = '%s' AND verb = '%s')",
dbesc($mid),
dbesc(ACTIVITY_OBJ_FILE),
dbesc('%"hash":"' . $hash . '"%'),
dbesc(json_encode($object)),
dbesc(ACTIVITY_POST),
dbesc($xx['object']),
dbesc(ACTIVITY_UPDATE)
);

2
view/tpl/hdr.tpl
View File

@ -1,5 +1,5 @@
<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
<ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li>
<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li>
</ul>