MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tabs trouble? What happened? I sure aven't changed anything to my editor...

Browse source
This commit is contained in:
Domovoy 2012-09-10 10:36:30 +02:00
parent 51bcd862d7
commit 16eec24a21
3 changed files with 1068 additions and 1068 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2110
include/conversation.php
View file

File diff suppressed because it is too large Load diff

12
object/Conversation.php
View file

@ -87,8 +87,8 @@ class Conversation extends BaseObject {
* Add a thread to the conversation * Add a thread to the conversation
* *
* Returns: * Returns:
* _ The inserted item on success * _ The inserted item on success
* _ false on failure * _ false on failure
*/ */
public function add_thread($item) { public function add_thread($item) {
$item_id = $item->get_id(); $item_id = $item->get_id();
@ -123,8 +123,8 @@ class Conversation extends BaseObject {
* We should find a way to avoid using those arguments (at least most of them) * We should find a way to avoid using those arguments (at least most of them)
* *
* Returns: * Returns:
* _ The data requested on success * _ The data requested on success
* _ false on failure * _ false on failure
*/ */
public function get_template_data($alike, $dlike) { public function get_template_data($alike, $dlike) {
$result = array(); $result = array();
@ -147,8 +147,8 @@ class Conversation extends BaseObject {
* Get a thread based on its item id * Get a thread based on its item id
* *
* Returns: * Returns:
* _ The found item on success * _ The found item on success
* _ false on failure * _ false on failure
*/ */
private function get_thread($id) { private function get_thread($id) {
foreach($this->threads as $item) { foreach($this->threads as $item) {

14
object/Item.php
View file

@ -76,8 +76,8 @@ class Item extends BaseObject {
* Get data in a form usable by a conversation template * Get data in a form usable by a conversation template
* *
* Returns: * Returns:
* _ The data requested on success * _ The data requested on success
* _ false on failure * _ false on failure
*/ */
public function get_template_data($alike, $dlike, $thread_level=1) { public function get_template_data($alike, $dlike, $thread_level=1) {
$result = array(); $result = array();
@ -130,7 +130,7 @@ class Item extends BaseObject {
if($sp) if($sp)
$sparkle = ' sparkle'; $sparkle = ' sparkle';
else else
$profile_link = zrl($profile_link); $profile_link = zrl($profile_link);
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
@ -413,8 +413,8 @@ class Item extends BaseObject {
* Get a data value * Get a data value
* *
* Returns: * Returns:
* _ value on success * _ value on success
* _ false on failure * _ false on failure
*/ */
public function get_data_value($name) { public function get_data_value($name) {
if(!isset($this->data[$name])) { if(!isset($this->data[$name])) {
@ -489,8 +489,8 @@ class Item extends BaseObject {
* Get the comment box * Get the comment box
* *
* Returns: * Returns:
* _ The comment box string (empty if no comment box) * _ The comment box string (empty if no comment box)
* _ false on failure * _ false on failure
*/ */
private function get_comment_box($indent) { private function get_comment_box($indent) {
if(!$this->is_toplevel() && !get_config('system','thread_allow')) { if(!$this->is_toplevel() && !get_config('system','thread_allow')) {