nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

Browse source 
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-21 20:01:51 +01:00
commit 0436782e70
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/like.php
View file

@ -166,7 +166,6 @@ function do_like($item_id, $verb) {
$post_type = (($item['resource-id']) ? t('photo') : t('status'));
if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
$post_type = t('event');
}
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
$body = $item['body'];

6
mod/proxy.php
View file

@ -140,17 +140,23 @@ function proxy_init(App $a) {
if (!$direct_cache AND ($cachefile == '')) {
$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
if (dbm::is_result($r)) {
<<<<<<< HEAD
<<<<<<< origin/rewrites/app_get_baseurl_static
$img_str = $r[0]['data'];
$mime = $r[0]["desc"];
if ($mime == "") $mime = "image/jpeg";
=======
=======
>>>>>>> upstream/develop
$img_str = $r[0]['data'];
$mime = $r[0]['desc'];
if ($mime == '') {
$mime = 'image/jpeg';
}
<<<<<<< HEAD
>>>>>>> HEAD~0
=======
>>>>>>> upstream/develop
}
} else {
$r = array();

3
view/theme/frio/js/hovercard.js
View file

@ -79,7 +79,8 @@ $(document).ready(function(){
},
trigger: hctrigger,
template: '<div class="popover hovercard" data-card-created="' + timeNow + '"><div class="arrow"></div><div class="popover-content hovercard-content"></div></div>',
content: data
content: data,
container: "body",
}).popover('show');
}
});

1
view/theme/frio/js/theme.js
View file

@ -100,6 +100,7 @@ $(document).ready(function(){
// initialize the bootstrap tooltips
$('body').tooltip({
selector: '[data-toggle="tooltip"]',
container: 'body',
animation: true,
html: true,
placement: 'auto',

2
view/theme/frio/templates/nav.tpl
View file

@ -278,7 +278,7 @@
<ul id="nav-notifications-template" class="media-list" style="display:none;" rel="template">
<li class="{4} notif-entry">
<div class="notif-entry-wrapper media">
<div class="notif-photo-wrapper media-object pull-left"><a href="{6}"><img data-src="{1}"></a></div>
<div class="notif-photo-wrapper media-object pull-left"><a href="{6}" class="userinfo"><img data-src="{1}"></a></div>
<a href="{0}" class="notif-desc-wrapper media-body">
{2}
<div><time class="notif-when time" data-toggle="tooltip" title="{5}">{3}</time></div>