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

Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links

Browse source 
# Conflicts:
#	include/follow.php
This commit is contained in:
Hypolite Petovan 2016-12-20 12:50:36 -05:00
commit e8e1f9253d
148 changed files with 12178 additions and 11976 deletions
Download patch file Download diff file Expand all files Collapse all files

3
object/BaseObject.php
View file

@ -21,8 +21,7 @@ class BaseObject {
if(self::$app)
return self::$app;
global $a;
self::$app = $a;
self::$app = get_app();
return self::$app;
}

2
object/Conversation.php
View file

@ -127,7 +127,7 @@ class Conversation extends BaseObject {
* _ false on failure
*/
public function get_template_data($conv_responses) {
global $a;
$a = get_app();
$result = array();
$i = 0;

2
object/Item.php
View file

@ -235,7 +235,7 @@ class Item extends BaseObject {
intval($item['uid']),
intval($item['id'])
);
if (count($r)) {
if (dbm::is_result($r)) {
$ignore = array(
'do' => t("ignore thread"),
'undo' => t("unignore thread"),