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

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-09-26 16:26:08 -07:00
commit 8e94e79c7b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/items.php
View File

@ -98,6 +98,10 @@ function can_comment_on_post($observer_xchan,$item) {
return true; return true;
break; break;
case 'public': 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; return false;
break; break;
case 'contacts': case 'contacts':
@ -3874,4 +3878,4 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
} }
return $items; return $items;
} }

2
include/page_widgets.php
View File

@ -5,7 +5,7 @@ function writepages_widget ($who,$which){
return replace_macros(get_markup_template('write_pages.tpl'), array( return replace_macros(get_markup_template('write_pages.tpl'), array(
'$new' => t('New Page'), '$new' => t('New Page'),
'$newurl' => "webpages/$who", '$newurl' => "webpages/$who",
'$edit' => t('edit'), '$edit' => t('Edit'),
'$editurl' => "editwebpage/$who/$which" '$editurl' => "editwebpage/$who/$which"
)); ));
} }