aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-10 05:14:23 -0700
committerfriendica <info@friendica.com>2013-07-10 05:14:23 -0700
commit72d737cc82f5987791c9ceba0c8b99a505886274 (patch)
treeb0624393c4fc6e8c7ecc63a45d311575169b002c
parent5a8cda632b4ba78e19d49b0c652f43940a18ea9e (diff)
downloadvolse-hubzilla-72d737cc82f5987791c9ceba0c8b99a505886274.tar.gz
volse-hubzilla-72d737cc82f5987791c9ceba0c8b99a505886274.tar.bz2
volse-hubzilla-72d737cc82f5987791c9ceba0c8b99a505886274.zip
fix missing edit link
-rw-r--r--include/ItemObject.php9
-rw-r--r--version.inc2
2 files changed, 5 insertions, 6 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index a56f66a01..7a9e43819 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -25,7 +25,6 @@ class Item extends BaseObject {
private $wall_to_wall = false;
private $threaded = false;
private $visiting = false;
- private $observer = null;
private $channel = null;
public function __construct($data) {
@@ -68,7 +67,6 @@ class Item extends BaseObject {
$result = array();
$a = $this->get_app();
- $observer = $this->observer;
$item = $this->get_data();
$commentww = '';
@@ -82,6 +80,7 @@ class Item extends BaseObject {
$total_children = $this->count_descendants();
$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'])
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
@@ -94,8 +93,8 @@ class Item extends BaseObject {
else
$edpost = false;
- if($this->observer['xchan_hash'] == $this->get_data_value('author_xchan')
- || $this->observer['xchan_hash'] == $this->get_data_value('owner_xchan')
+ if($observer['xchan_hash'] == $this->get_data_value('author_xchan')
+ || $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
|| $this->get_data_value('uid') == local_user())
$dropping = true;
@@ -105,7 +104,7 @@ class Item extends BaseObject {
'delete' => t('Delete'),
);
}
-
+// FIXME
if($observer_is_pageowner) {
$multidrop = array(
'select' => t('Select'),
diff --git a/version.inc b/version.inc
index 09f027043..11af6685f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-07-09.369
+2013-07-10.370