diff options
Diffstat (limited to 'mod/blog')
| -rw-r--r-- | mod/blog/lib/blog.php | 3 | ||||
| -rw-r--r-- | mod/blog/manifest.xml | 1 | ||||
| -rw-r--r-- | mod/blog/views/default/blog/group_module.php | 2 | ||||
| -rw-r--r-- | mod/blog/views/default/blog/sidebar/revisions.php | 6 | ||||
| -rw-r--r-- | mod/blog/views/default/object/blog.php | 2 | ||||
| -rw-r--r-- | mod/blog/views/default/widgets/blog/content.php | 1 | 
6 files changed, 12 insertions, 3 deletions
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index f24e6f58d..41924f336 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -124,6 +124,9 @@ function blog_get_page_content_list($container_guid = NULL) {  function blog_get_page_content_friends($user_guid) {  	$user = get_user($user_guid); +	if (!$user) { +		forward('blog/all'); +	}  	$return = array(); diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml index 991462060..dfbd7a1a6 100644 --- a/mod/blog/manifest.xml +++ b/mod/blog/manifest.xml @@ -15,6 +15,5 @@  		<type>elgg_version</type>  		<version>2010030101</version>  	</requires> -	<admin_interface>simple</admin_interface>  	<activate_on_install>true</activate_on_install>  </plugin_manifest> diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php index d769fbd59..028827178 100644 --- a/mod/blog/views/default/blog/group_module.php +++ b/mod/blog/views/default/blog/group_module.php @@ -12,6 +12,7 @@ if ($group->blog_enable == "no") {  $all_link = elgg_view('output/url', array(  	'href' => "blog/group/$group->guid/all",  	'text' => elgg_echo('link:view:all'), +	'is_trusted' => true,  ));  elgg_push_context('widgets'); @@ -33,6 +34,7 @@ if (!$content) {  $new_link = elgg_view('output/url', array(  	'href' => "blog/add/$group->guid",  	'text' => elgg_echo('blog:write'), +	'is_trusted' => true,  ));  echo elgg_view('groups/profile/module', array( diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php index c23b3b052..cd2e7f3d8 100644 --- a/mod/blog/views/default/blog/sidebar/revisions.php +++ b/mod/blog/views/default/blog/sidebar/revisions.php @@ -39,7 +39,8 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {  		if ($blog->status == 'published') {  			$load = elgg_view('output/url', array(  				'href' => $load_base_url, -				'text' => elgg_echo('blog:status:published') +				'text' => elgg_echo('blog:status:published'), +				'is_trusted' => true,  			));  			$time = "<span class='elgg-subtext'>" @@ -59,7 +60,8 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {  			}  			$load = elgg_view('output/url', array(  				'href' => "$load_base_url/$revision->id", -				'text' => $revision_lang +				'text' => $revision_lang, +				'is_trusted' => true,  			));  			$text = "$load: $time"; diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index ba08180b1..ab75bd09b 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -21,6 +21,7 @@ $owner_icon = elgg_view_entity_icon($owner, 'tiny');  $owner_link = elgg_view('output/url', array(  	'href' => "blog/owner/$owner->username",  	'text' => $owner->name, +	'is_trusted' => true,  ));  $author_text = elgg_echo('byline', array($owner_link));  $tags = elgg_view('output/tags', array('tags' => $blog->tags)); @@ -35,6 +36,7 @@ if ($blog->comments_on != 'Off') {  		$comments_link = elgg_view('output/url', array(  			'href' => $blog->getURL() . '#blog-comments',  			'text' => $text, +			'is_trusted' => true,  		));  	} else {  		$comments_link = ''; diff --git a/mod/blog/views/default/widgets/blog/content.php b/mod/blog/views/default/widgets/blog/content.php index 7bbfc3c74..330171662 100644 --- a/mod/blog/views/default/widgets/blog/content.php +++ b/mod/blog/views/default/widgets/blog/content.php @@ -22,6 +22,7 @@ if ($content) {  	$more_link = elgg_view('output/url', array(  		'href' => $blog_url,  		'text' => elgg_echo('blog:moreblogs'), +		'is_trusted' => true,  	));  	echo "<span class=\"elgg-widget-more\">$more_link</span>";  } else {  | 
