diff options
| author | friendica <info@friendica.com> | 2013-09-26 16:26:08 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-26 16:26:08 -0700 |
| commit | 8e94e79c7bfc4253efb17f32246bdafd498a3aed (patch) | |
| tree | 473a0bbad205c5b4a7dfa0be5dac8d649ededaac | |
| parent | edc5566f79c94f7ad994eccc7a8bb0e586961cf4 (diff) | |
| parent | c81ad135acc64065a95f0fee3c339e59504b7e45 (diff) | |
| download | volse-hubzilla-8e94e79c7bfc4253efb17f32246bdafd498a3aed.tar.gz volse-hubzilla-8e94e79c7bfc4253efb17f32246bdafd498a3aed.tar.bz2 volse-hubzilla-8e94e79c7bfc4253efb17f32246bdafd498a3aed.zip | |
Merge https://github.com/friendica/red into zpull
| -rwxr-xr-x | include/items.php | 6 | ||||
| -rw-r--r-- | include/page_widgets.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 4aecf9174..25bcf0253 100755 --- a/include/items.php +++ b/include/items.php @@ -98,6 +98,10 @@ function can_comment_on_post($observer_xchan,$item) { return true; break; case 'public': + # We don't allow public comments yet, until a policy + # for dealing with anonymous comments is in place with + # a means to moderate comments. Until that time, return + # false. return false; break; case 'contacts': @@ -3874,4 +3878,4 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C } return $items; -}
\ No newline at end of file +} diff --git a/include/page_widgets.php b/include/page_widgets.php index 23d6d25ba..d70281afc 100644 --- a/include/page_widgets.php +++ b/include/page_widgets.php @@ -5,7 +5,7 @@ function writepages_widget ($who,$which){ return replace_macros(get_markup_template('write_pages.tpl'), array( '$new' => t('New Page'), '$newurl' => "webpages/$who", - '$edit' => t('edit'), + '$edit' => t('Edit'), '$editurl' => "editwebpage/$who/$which" )); } |