Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: util/messages.po
2015-06-06 17:31:22 -07:00
parent 7cbc504874 f5e439236c
commit ec1dcb8f2e
16 changed files with 702 additions and 795 deletions
@@ -116,6 +116,7 @@ function impel_init(&$a) {
 		$arr['title'] = $j['title'];
 		$arr['body'] = $j['body'];
 		$arr['term'] = $j['term'];
+		$arr['layout_mid'] = $j['layout_mid'];
 		$arr['created'] = datetime_convert('UTC','UTC', $j['created']);
 		$arr['edited'] = datetime_convert('UTC','UTC',$j['edited']);
 		$arr['owner_xchan'] = get_observer_hash();