Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 05:10:41 +0000 (13:10 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 05:10:41 +0000 (13:10 +0800)
1  2 
mod/wiki/pagelib.php
mod/wiki/renderer.php

Simple merge
@@@ -337,14 -347,9 +347,9 @@@ class mod_wiki_renderer extends plugin_
                      }
  
                      echo $this->output->container_start('wiki_right');
-                     $params = array('wid' => $wiki->id, 'title' => $page->title);
-                     if ($pagetype == 'files') {
-                         $params['pageid'] = $page->id;
-                     }
-                     $baseurl->params($params);
                      $name = 'uid';
                      $selected = $subwiki->userid;
 -                    echo $this->output->single_select($baseurl, $name, $options, $selected);
 +                    echo $this->output->single_select($baseurl, $name, $options, $selected, null);
                      echo $this->output->container_end();
                  }
                  return;
                      }
                  }
                  echo $this->output->container_start('wiki_right');
-                 $params = array('wid' => $wiki->id, 'title' => $page->title);
-                 if ($pagetype == 'files') {
-                     $params['pageid'] = $page->id;
-                 }
-                 $baseurl->params($params);
                  $name = 'groupanduser';
                  $selected = $subwiki->groupid . '-' . $subwiki->userid;
 -                echo $this->output->single_select($baseurl, $name, $options, $selected);
 +                echo $this->output->single_select($baseurl, $name, $options, $selected, null);
                  echo $this->output->container_end();
  
                  return;
                  }
  
                  echo $this->output->container_start('wiki_right');
-                 $params = array('wid' => $wiki->id, 'title' => $page->title);
-                 if ($pagetype == 'files') {
-                     $params['pageid'] = $page->id;
-                 }
-                 $baseurl->params($params);
                  $name = 'groupanduser';
                  $selected = $subwiki->groupid . '-' . $subwiki->userid;
 -                echo $this->output->single_select($baseurl, $name, $options, $selected);
 +                echo $this->output->single_select($baseurl, $name, $options, $selected, null);
                  echo $this->output->container_end();
  
                  return;