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
--- a/mod/webpages.php
+++ b/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'],