tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix

Browse source
This commit is contained in:
Michael Vogel 2015-11-17 21:34:01 +01:00
commit 41fe07e128
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/items.php
View file

@ -2384,7 +2384,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
$photos = import_profile_photo($photo_url,$contact['uid'],$contact['id']); $photos = import_profile_photo($photo_url,$contact['uid'],$contact['id']);
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s' q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
WHERE `uid` = %d AND `id` = %d", WHERE `uid` = %d AND `id` = %d AND NOT `self`",
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
@ -2403,7 +2403,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
intval($contact['id']) intval($contact['id'])
); );
$x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d AND `name` != '%s'", $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d AND `name` != '%s' AND NOT `self`",
dbesc(notags(trim($new_name))), dbesc(notags(trim($new_name))),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($contact['uid']), intval($contact['uid']),
@ -3083,7 +3083,7 @@ function local_delivery($importer,$data) {
$photos = import_profile_photo($photo_url,$importer['importer_uid'],$importer['id']); $photos = import_profile_photo($photo_url,$importer['importer_uid'],$importer['id']);
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s' q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
WHERE `uid` = %d AND `id` = %d", WHERE `uid` = %d AND `id` = %d AND NOT `self`",
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
@ -3102,7 +3102,7 @@ function local_delivery($importer,$data) {
intval($importer['id']) intval($importer['id'])
); );
$x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d AND `name` != '%s'", $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d AND `name` != '%s' AND NOT `self`",
dbesc(notags(trim($new_name))), dbesc(notags(trim($new_name))),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($importer['importer_uid']), intval($importer['importer_uid']),

10
mod/dfrn_poll.php
View file

@ -476,8 +476,8 @@ function dfrn_poll_content(&$a) {
// URL reply // URL reply
if($dfrn_version < 2.2) { if($dfrn_version < 2.2) {
$s = fetch_url($r[0]['poll'] $s = fetch_url($r[0]['poll']
. '?dfrn_id=' . $encrypted_id . '?dfrn_id=' . $encrypted_id
. '&type=profile-check' . '&type=profile-check'
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&challenge=' . $challenge . '&challenge=' . $challenge
@ -493,7 +493,7 @@ function dfrn_poll_content(&$a) {
'sec' => $sec 'sec' => $sec
)); ));
} }
$profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); $profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
switch($destination_url) { switch($destination_url) {
@ -506,7 +506,7 @@ function dfrn_poll_content(&$a) {
case 'status': case 'status':
case '': case '':
$dest = $a->get_baseurl() . '/profile/' . $profile; $dest = $a->get_baseurl() . '/profile/' . $profile;
break; break;
default: default:
$dest = $destination_url . '?f=&redir=1'; $dest = $destination_url . '?f=&redir=1';
break; break;
@ -564,5 +564,3 @@ function dfrn_poll_content(&$a) {
} }
} }
} }

6
view/templates/widget_forumlist.tpl
View file

@ -1,13 +1,13 @@
<script> <script>
function showHideForumlist() { function showHideForumlist() {
if( $('#forum-widget-entry-extended').is(':visible')) { if( $("div[id^='forum-widget-entry-extended-']").is(':visible')) {
$('#forum-widget-entry-extended').hide(); $("div[id^='forum-widget-entry-extended-']").hide();
$('#forum-widget-collapse').html(window.showMore); $('#forum-widget-collapse').html(window.showMore);
} }
else { else {
$('#forum-widget-entry-extended').show(); $("div[id^='forum-widget-entry-extended-']").show();
$('#forum-widget-collapse').html(window.showFewer); $('#forum-widget-collapse').html(window.showFewer);
} }
} }