diff options
| -rw-r--r-- | include/conversation.php | 22 | ||||
| -rw-r--r-- | mod/network.php | 2 | ||||
| -rw-r--r-- | mod/ping.php | 3 | ||||
| -rw-r--r-- | mod/update_network.php | 1 |
4 files changed, 17 insertions, 11 deletions
diff --git a/include/conversation.php b/include/conversation.php index 94865e783..179bc8e0f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -588,15 +588,15 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), + 'name' => $profile_name, 'sparkle' => $sparkle, 'lock' => $lock, 'thumb' => $profile_avatar, - 'title' => template_escape($item['title']), - 'body' => template_escape($body), - 'tags' => template_escape($tags), - 'hashtags' => template_escape($hashtags), - 'mentions' => template_escape($mentions), + 'title' => $item['title'], + 'body' => $body, + 'tags' => $tags, + 'hashtags' => $hashtags, + 'mentions' => $mentions, 'txt_cats' => t('Categories:'), 'txt_folders' => t('Filed under:'), 'has_cats' => ((count($categories)) ? 'true' : ''), @@ -604,14 +604,14 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { 'categories' => $categories, 'folders' => $folders, - 'text' => strip_tags(template_escape($body)), + 'text' => strip_tags($body), 'ago' => relative_date($item['created']), 'app' => $item['app'], 'str_app' => sprintf( t(' from %s'), $item['app']), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), - 'location' => template_escape($location), + 'location' => $location, 'indent' => '', - 'owner_name' => template_escape($owner_name), + 'owner_name' => $owner_name, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, 'plink' => get_plink($item), @@ -705,6 +705,10 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { if($page_mode === 'preview') logger('preview: ' . print_r($threads,true)); + +// logger('nouveau: ' . print_r($threads,true)); + + $o = replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), '$live_update' => $live_update_div, diff --git a/mod/network.php b/mod/network.php index 04390d3f1..837ac7aea 100644 --- a/mod/network.php +++ b/mod/network.php @@ -680,7 +680,7 @@ function network_content(&$a, $update = 0, $load = false) { } - // logger('items: ' . count($items)); + logger('items: ' . count($items)); if($update_unseen) $r = q("UPDATE `item` SET item_flags = ( item_flags ^ %d) diff --git a/mod/ping.php b/mod/ping.php index 4ab7a68cb..0e3ad83db 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -49,6 +49,7 @@ function ping_init(&$a) { } if(x($_REQUEST,'markRead') && local_user()) { + switch($_REQUEST['markRead']) { case 'network': $r = q("update item set item_flags = ( item_flags ^ %d ) where (item_flags & %d) and uid = %d", @@ -67,7 +68,7 @@ function ping_init(&$a) { ); break; case 'messages': - $r = q("update mail set mail_flags = ( item_flags ^ %d ) where uid = %d and not (item_flags & %d)", + $r = q("update mail set mail_flags = ( mail_flags ^ %d ) where channel_id = %d and not (mail_flags & %d)", intval(MAIL_SEEN), intval(local_user()), intval(MAIL_SEEN) diff --git a/mod/update_network.php b/mod/update_network.php index e13eef0e6..16de19365 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -33,6 +33,7 @@ function update_network_content(&$a) { echo str_replace("\t",' ',$text); echo (($_GET['msie'] == 1) ? '</div>' : '</section>'); echo "</body></html>\r\n"; +// logger('update_network: ' . $text); killme(); }
\ No newline at end of file |