aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Wiki.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-15 16:04:29 -0800
committerzotlabs <mike@macgirvin.com>2016-12-15 16:04:29 -0800
commit19d7cfd66b9ebf72a7812934b8fabfce9da1c174 (patch)
treefddd44639ccce74623ad84303ae3b8e2403fc2db /Zotlabs/Module/Wiki.php
parenta89772652d14db8196dc6c44f289d44613be2fea (diff)
parent4744e5024438a7c81fac199a0efd35a7a03aa86e (diff)
downloadvolse-hubzilla-19d7cfd66b9ebf72a7812934b8fabfce9da1c174.tar.gz
volse-hubzilla-19d7cfd66b9ebf72a7812934b8fabfce9da1c174.tar.bz2
volse-hubzilla-19d7cfd66b9ebf72a7812934b8fabfce9da1c174.zip
Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_merge
Diffstat (limited to 'Zotlabs/Module/Wiki.php')
-rw-r--r--Zotlabs/Module/Wiki.php10
1 files changed, 1 insertions, 9 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 06a4d0f24..7b0ec9d83 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -242,20 +242,12 @@ class Wiki extends \Zotlabs\Web\Controller {
'$wikiheaderName' => $wikiheaderName,
'$wikiheaderPage' => $wikiheaderPage,
'$renamePage' => $renamePage,
- '$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'),
'$showPageControls' => $showPageControls,
'$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')),
'$tools_label' => 'Page Tools',
'$channel' => $owner['channel_address'],
'$resource_id' => $resource_id,
'$page' => $pageUrlName,
- '$lockstate' => $x['lockstate'],
- '$acl' => $x['acl'],
- '$allow_cid' => $x['allow_cid'],
- '$allow_gid' => $x['allow_gid'],
- '$deny_cid' => $x['deny_cid'],
- '$deny_gid' => $x['deny_gid'],
- '$bang' => $x['bang'],
'$mimeType' => $mimeType,
'$content' => $content,
'$renderedContent' => $renderedContent,
@@ -270,7 +262,7 @@ class Wiki extends \Zotlabs\Web\Controller {
'$embedPhotosModalOK' => t('OK'),
'$modalchooseimages' => t('Choose images to embed'),
'$modalchoosealbum' => t('Choose an album'),
- '$modaldiffalbum' => t('Choose a different album...'),
+ '$modaldiffalbum' => t('Choose a different album'),
'$modalerrorlist' => t('Error getting album list'),
'$modalerrorlink' => t('Error getting photo link'),
'$modalerroralbum' => t('Error getting album'),