diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-06 17:31:22 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-06 17:31:22 -0700 |
| commit | ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41 (patch) | |
| tree | 23b11b256e942ce408d305b509bc1c0ddaaed4ce /mod | |
| parent | 7cbc5048743bc5976e48cd3f81801550c0b7f52f (diff) | |
| parent | f5e439236c91134efab7bc04c2c98c23a81dc03d (diff) | |
| download | volse-hubzilla-ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41.tar.gz volse-hubzilla-ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41.tar.bz2 volse-hubzilla-ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/impel.php | 1 | ||||
| -rw-r--r-- | mod/settings.php | 3 | ||||
| -rw-r--r-- | mod/webpages.php | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/mod/impel.php b/mod/impel.php index ff154125b..94e343ed1 100644 --- a/mod/impel.php +++ b/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(); diff --git a/mod/settings.php b/mod/settings.php index 550236c47..692668060 100644 --- a/mod/settings.php +++ b/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), diff --git a/mod/webpages.php b/mod/webpages.php index f7043d5e1..1795b52a0 100644 --- 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'], |