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

fix missing edit link

Browse Source
This commit is contained in:
friendica 2013-07-10 05:14:23 -07:00
parent 5a8cda632b
commit 72d737cc82
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/ItemObject.php
View File

@ -25,7 +25,6 @@ class Item extends BaseObject {
private $wall_to_wall = false; private $wall_to_wall = false;
private $threaded = false; private $threaded = false;
private $visiting = false; private $visiting = false;
private $observer = null;
private $channel = null; private $channel = null;
public function __construct($data) { public function __construct($data) {
@ -68,7 +67,6 @@ class Item extends BaseObject {
$result = array(); $result = array();
$a = $this->get_app(); $a = $this->get_app();
$observer = $this->observer;
$item = $this->get_data(); $item = $this->get_data();
$commentww = ''; $commentww = '';
@ -82,6 +80,7 @@ class Item extends BaseObject {
$total_children = $this->count_descendants(); $total_children = $this->count_descendants();
$conv = $this->get_conversation(); $conv = $this->get_conversation();
$observer = $conv->get_observer();
$lock = ((($item['item_private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) $lock = ((($item['item_private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|| strlen($item['deny_cid']) || strlen($item['deny_gid'])))) || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
@ -94,8 +93,8 @@ class Item extends BaseObject {
else else
$edpost = false; $edpost = false;
if($this->observer['xchan_hash'] == $this->get_data_value('author_xchan') if($observer['xchan_hash'] == $this->get_data_value('author_xchan')
|| $this->observer['xchan_hash'] == $this->get_data_value('owner_xchan') || $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
|| $this->get_data_value('uid') == local_user()) || $this->get_data_value('uid') == local_user())
$dropping = true; $dropping = true;
@ -105,7 +104,7 @@ class Item extends BaseObject {
'delete' => t('Delete'), 'delete' => t('Delete'),
); );
} }
// FIXME
if($observer_is_pageowner) { if($observer_is_pageowner) {
$multidrop = array( $multidrop = array(
'select' => t('Select'), 'select' => t('Select'),

2
version.inc
View File

@ -1 +1 @@
2013-07-09.369 2013-07-10.370