oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	boot.php
	include/items.php
	update.php
This commit is contained in:
Michael Vogel 2013-01-20 14:07:57 +01:00
commit 4e3d0018c6
739 changed files with 9949 additions and 5340 deletions
Download patch file Download diff file Expand all files Collapse all files

9
object/Item.php
View file

@ -66,6 +66,7 @@ class Item extends BaseObject {
if(! visible_activity($item)) {
continue;
}
$item['pagedrop'] = $data['pagedrop'];
$child = new Item($item);
$this->add_child($child);
}
@ -536,13 +537,7 @@ class Item extends BaseObject {
return false;
}
if($a->theme['template_engine'] === 'smarty3') {
$template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
}
else {
$template_file = $this->available_templates[$name];
}
$this->template = $template_file;
$this->template = $this->available_templates[$name];
}
/**