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

Conflicts:
	util/messages.po

mod/impel.php

@@ -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();

mod/settings.php

@@ -844,6 +844,9 @@ function settings_content(&$a) {
 		$tpl = get_markup_template("settings_display.tpl");
 		$o = replace_macros($tpl, array(
 			'$ptitle' 	=> t('Display Settings'),
+			'$d_tset'       => t('Theme Settings'), 
+			'$d_ctset'      => t('Custom Theme Settings'), 
+			'$d_cset'       => t('Content Settings'),
 			'$form_security_token' => get_form_security_token("settings_display"),
 			'$submit' 	=> t('Submit'),
 			'$baseurl' => $a->get_baseurl(true),

mod/webpages.php

@@ -155,7 +155,8 @@ function webpages_content(&$a) {
 				'edited'	=> $rr['edited'],
 				'mimetype'	=> $rr['mimetype'],
 				'pagetitle'	=> $rr['sid'],
-				'mid'		=> $rr['mid']
+				'mid'		=> $rr['mid'],
+				'layout_mid'    => $rr['layout_mid']
 			);
 			$pages[$rr['iid']][] = array(
 				'url'		=> $rr['iid'],