From 25881d1e2c698846f477c7416158803fdbc7eb5e Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Wed, 12 Apr 2006 02:27:14 +0000 Subject: [PATCH] fixed a bug where non admins can't add blocks to own blog page --- blog/blogpage.php | 8 ++++++-- blog/lib.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/blog/blogpage.php b/blog/blogpage.php index 66cf8cbfdd..e2cddaeed2 100644 --- a/blog/blogpage.php +++ b/blog/blogpage.php @@ -63,7 +63,9 @@ class page_blog extends page_base { // For this test page, only admins are going to be allowed editing (for simplicity). function user_allowed_editing() { - if (isadmin() || ((isset($this->bloginfo) && blog_user_has_rights($this->bloginfo))) || ($this->courseid != '' && isteacher($this->courseid)) ) { + if (isloggedin() && !isguest()) { + + //if (isadmin() || ((isset($this->bloginfo) && blog_user_has_rights($this->bloginfo))) || ($this->courseid != '' && isteacher($this->courseid)) ) { return true; } return false; @@ -72,7 +74,9 @@ class page_blog extends page_base { // Also, admins are considered to have "always on" editing (I wanted to avoid duplicating // the code that turns editing on/off here; you can roll your own or copy course/view.php). function user_is_editing() { - if (isadmin() || ((isset($this->bloginfo) && blog_user_has_rights($this->bloginfo))) || ($this->courseid != '' && isteacher($this->courseid)) ) { + if (isloggedin() && !isguest()) { + + //if (isadmin() || ((isset($this->bloginfo) && blog_user_has_rights($this->bloginfo))) || ($this->courseid != '' && isteacher($this->courseid)) ) { global $SESSION; if (empty($SESSION->blog_editing_enabled)) { $SESSION->blog_editing_enabled = false; diff --git a/blog/lib.php b/blog/lib.php index 2843a6b1a6..0958167978 100755 --- a/blog/lib.php +++ b/blog/lib.php @@ -348,7 +348,7 @@ if (user_can_change_publish_state($blogEntry) && blog_isediting() ) { $menu .= '
'. get_string('publishto', 'blog').': '; $options = blog_applicable_publish_states(); - $menu .= choose_from_menu($options, $this->entryuserid .'-'. $this->entryId, $this->entryPublishState, '', '', '0', true); + $menu .= choose_from_menu($options, $blogEntry->userid .'-'. $blogEntry->id, $blogEntry->publishstate, '', '', '0', true); $menu .= "\n".'
'."\n"; /// batch publish might not be needed if ($includehelp) { -- 2.39.5