harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make wiki page mimetype default to wiki mimetype (this was the original intent but the wrong variable was used)

Browse Source
This commit is contained in:
zotlabs 2017-09-13 21:36:59 -07:00
parent b5966041be
commit 5be132f877
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Widget/Wiki_pages.php
View File

@ -50,7 +50,7 @@ class Wiki_pages {
'$canadd' => $can_create, '$canadd' => $can_create,
'$candel' => $can_delete, '$candel' => $can_delete,
'$addnew' => t('Add new page'), '$addnew' => t('Add new page'),
'$mimetype' => mimetype_select(0,$p['mimeType'], [ 'text/markdown','text/bbcode' ]), '$mimetype' => mimetype_select(0,$w['mimeType'], [ 'text/markdown','text/bbcode' ]),
'$pageName' => array('pageName', t('Page name')), '$pageName' => array('pageName', t('Page name')),
'$refresh' => $arr['refresh'] '$refresh' => $arr['refresh']
)); ));

4
include/zot.php
View File

@ -4187,7 +4187,9 @@ function zot_site_info($channel = null) {
$ret['site'] = []; $ret['site'] = [];
$ret['site']['url'] = z_root(); $ret['site']['url'] = z_root();
$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$signing_key,$sig_method)); $ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$signing_key,$sig_method));
$ret['site']['zot_auth'] = z_root() . '/magic'; $ret['site']['post'] = z_root() . '/post';
$ret['site']['openWebAuth'] = z_root() . '/owa';
$ret['site']['authRedirect'] = z_root() . '/magic';
$ret['site']['key'] = get_config('system','pubkey'); $ret['site']['key'] = get_config('system','pubkey');
$dirmode = get_config('system','directory_mode'); $dirmode = get_config('system','directory_mode');