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

fix starring posts

Browse Source
This commit is contained in:
friendica 2012-10-27 05:26:34 -07:00
parent 96c8e74438
commit 1a9ab12748
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ItemObject.php
View File

@ -173,14 +173,14 @@ class Item extends BaseObject {
if($this->is_toplevel()) { if($this->is_toplevel()) {
if($conv->get_profile_owner() == local_user()) { if($conv->get_profile_owner() == local_user()) {
$isstarred = (($item['starred']) ? "starred" : "unstarred"); $isstarred = (($item['item_flags'] & ITEM_STARRED) ? "starred" : "unstarred");
$star = array( $star = array(
'do' => t("add star"), 'do' => t("add star"),
'undo' => t("remove star"), 'undo' => t("remove star"),
'toggle' => t("toggle star status"), 'toggle' => t("toggle star status"),
'classdo' => (($item['starred']) ? "hidden" : ""), 'classdo' => (($item['item_flags'] & ITEM_STARRED) ? "hidden" : ""),
'classundo' => (($item['starred']) ? "" : "hidden"), 'classundo' => (($item['item_flags'] & ITEM_STARRED) ? "" : "hidden"),
'starred' => t('starred'), 'starred' => t('starred'),
'tagger' => t("add tag"), 'tagger' => t("add tag"),
'classtagger' => "", 'classtagger' => "",

6
include/conversation.php
View File

@ -513,14 +513,14 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
} }
} }
if($profile_owner == local_user()) { if($profile_owner == local_user()) {
$isstarred = (($item['starred']) ? "starred" : "unstarred"); $isstarred = (($item['item_flags'] & ITEM_STARRED) ? "starred" : "unstarred");
$star = array( $star = array(
'do' => t("add star"), 'do' => t("add star"),
'undo' => t("remove star"), 'undo' => t("remove star"),
'toggle' => t("toggle star status"), 'toggle' => t("toggle star status"),
'classdo' => (($item['starred']) ? "hidden" : ""), 'classdo' => (($item['item_flags'] & ITEM_STARRED) ? "hidden" : ""),
'classundo' => (($item['starred']) ? "" : "hidden"), 'classundo' => (($item['item_flags'] & ITEM_STARRED) ? "" : "hidden"),
'starred' => t('starred'), 'starred' => t('starred'),
'tagger' => t("add tag"), 'tagger' => t("add tag"),
'classtagger' => "", 'classtagger' => "",

2
js/main.js
View File

@ -548,7 +548,7 @@ function updateConvItems(mode,data) {
ident = ident.toString(); ident = ident.toString();
$('#like-rotator-' + ident).show(); $('#like-rotator-' + ident).show();
$.get('starred/' + ident, function(data) { $.get('starred/' + ident, function(data) {
if(data.match(/1/)) { if(data.result == 1) {
$('#starred-' + ident).addClass('starred'); $('#starred-' + ident).addClass('starred');
$('#starred-' + ident).removeClass('unstarred'); $('#starred-' + ident).removeClass('unstarred');
$('#star-' + ident).addClass('hidden'); $('#star-' + ident).addClass('hidden');

8
mod/starred.php
View File

@ -7,8 +7,8 @@ function starred_init(&$a) {
if(! local_user()) if(! local_user())
killme(); killme();
if($a->argc > 1) if(argc() > 1)
$message_id = intval($a->argv[1]); $message_id = intval(argv(1));
if(! $message_id) if(! $message_id)
killme(); killme();
@ -24,7 +24,7 @@ function starred_init(&$a) {
if($item_flags & ITEM_STARRED) if($item_flags & ITEM_STARRED)
$item_flags -= ITEM_STARRED; $item_flags -= ITEM_STARRED;
else else
$item_flags = $item_flags | ITEM_STARRED; $item_flags += ITEM_STARRED;
$r = q("UPDATE item SET item_flags = %d WHERE uid = %d and id = %d LIMIT 1", $r = q("UPDATE item SET item_flags = %d WHERE uid = %d and id = %d LIMIT 1",
@ -34,6 +34,6 @@ function starred_init(&$a) {
); );
header('Content-type: application/json'); header('Content-type: application/json');
echo json_encode(array('result' => intval($item_flags & ITEM_STARRED))); echo json_encode(array('result' => (($item_flags & ITEM_STARRED) ? 1 : 0)));
killme(); killme();
} }