diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-20 22:29:11 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-20 22:29:11 -0700 |
| commit | 5951fa56aee7a7b972cdcc8e26c7c754a69057db (patch) | |
| tree | b0dd21f875ce5841bec779b4319cdd04c1d5c86a /Zotlabs | |
| parent | 24a9c3ba79cc7639a9cc6082c13dfedbc989bc8d (diff) | |
| parent | 15691d3ced329dd8d6aa2c4fa7ca1ec1886a1c70 (diff) | |
| download | volse-hubzilla-5951fa56aee7a7b972cdcc8e26c7c754a69057db.tar.gz volse-hubzilla-5951fa56aee7a7b972cdcc8e26c7c754a69057db.tar.bz2 volse-hubzilla-5951fa56aee7a7b972cdcc8e26c7c754a69057db.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Widget/Wiki_pages.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 2668229ee..fe2bfbdfb 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -216,7 +216,8 @@ class Wiki extends \Zotlabs\Web\Controller { '$deny_cid' => $x['deny_cid'], '$deny_gid' => $x['deny_gid'], '$typelock' => array('typelock', t('Lock content type'), '', '', array(t('No'), t('Yes'))), - '$notify' => array('postVisible', t('Create a status post for this wiki'), '', '', array(t('No'), t('Yes'))) + '$notify' => array('postVisible', t('Create a status post for this wiki'), '', '', array(t('No'), t('Yes'))), + '$edit_wiki_name' => t('Edit Wiki Name') )); return $o; diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php index b4928ede5..ac44b8d88 100644 --- a/Zotlabs/Widget/Wiki_pages.php +++ b/Zotlabs/Widget/Wiki_pages.php @@ -56,7 +56,9 @@ class Wiki_pages { '$mimetype' => mimetype_select(0,$w['mimeType'], [ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]), '$pageName' => array('pageName', t('Page name')), - '$refresh' => $arr['refresh'] + '$refresh' => $arr['refresh'], + '$options' => t('Options'), + '$submit' => t('Submit') )); } } |