merged fix for MDL-7302, tagid lost when turning editting on and off

diff --git a/blog/blogpage.php b/blog/blogpage.php
index 6d47048b4672df519f2796c5ac131b5dffa40c04..e2d652ca84fdba12af039f45e9c2104895147021 100644 (file)
--- a/blog/blogpage.php
+++ b/blog/blogpage.php
@@ -13,6 +13,7 @@ class page_blog extends page_base {
     var $courseid = NULL;
     var $filtertype = NULL;
     var $filterselect = NULL;
+    var $tagid = NULL;
 
     // Mandatory; should return our identifier.
     function get_type() {
@@ -102,6 +103,7 @@ class page_blog extends page_base {
     }
 
     function url_get_parameters() {
+        
         $array = array();
         if (!$this->full_init_done) {
             $array['userid'] = $this->id;
@@ -117,6 +119,9 @@ class page_blog extends page_base {
         if (!empty($this->filterselect)) {
             $array['filterselect'] = $this->filterselect;
         }
+        if (!empty($this->tagid)) {
+            $array['tagid'] = $this->tagid;  
+        }
         return $array;
     }
 

diff --git a/blog/header.php b/blog/header.php
index a9efda524affe91ac7c8a47f456b7a782229a517..4f4c92fa9a01027902ae16e085cb2a9e11585e00 100755 (executable)
--- a/blog/header.php
+++ b/blog/header.php
@@ -43,6 +43,7 @@ if (empty($USER->id)) {
 $PAGE->courseid     = $courseid;
 $PAGE->filtertype   = $filtertype;
 $PAGE->filterselect = $filterselect;
+$PAGE->tagid        = $tagid;
 
 $PAGE->init_full(); //init the BlogInfo object and the courserecord object