diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index 1b8ea47ce39..b2b720b1d76 100644
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -58,7 +58,8 @@ require_login($course->id, true, $cm);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:managewiki', $context);
-add_to_log($course->id, "wiki", "admin", "admin.php?id=$cm->id", "$wiki->id");
+
+add_to_log($course->id, "wiki", "admin", "admin.php?pageid=".$page->id, $page->id, $cm->id);
 
 //Delete page if a page ID to delete was supplied
 if (!empty($delete) && confirm_sesskey()) {
diff --git a/mod/wiki/comments.php b/mod/wiki/comments.php
index c28cbf4ad47..3032dba5080 100644
--- a/mod/wiki/comments.php
+++ b/mod/wiki/comments.php
@@ -59,7 +59,7 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST)
 
 require_login($course->id, true, $cm);
 
-add_to_log($course->id, 'wiki', 'view comments', "comments.php?pageid=$pageid", $page->title, $cm->id);
+add_to_log($course->id, 'wiki', 'comments', "comments.php?pageid=".$pageid, $pageid, $cm->id);
 
 /// Print the page header
 $wikipage = new page_wiki_comments($wiki, $subwiki, $cm);
diff --git a/mod/wiki/create.php b/mod/wiki/create.php
index 46939c2130f..d9e8d2d8d0e 100644
--- a/mod/wiki/create.php
+++ b/mod/wiki/create.php
@@ -89,16 +89,14 @@ $wikipage->set_action($action);
 switch ($action) {
 case 'create':
     $newpageid = $wikipage->create_page($title);
-    $newtitle = $wikipage->get_title();
-    add_to_log($course->id, 'wiki', 'add page', "view.php?pageid=$newpageid", "$newtitle", $cm->id);
-    redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $newpageid);
+    add_to_log($course->id, 'wiki', 'add page', "view.php?pageid=".$newpageid, $newpageid, $cm->id);
+    redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid='.$newpageid);
     break;
 case 'new':
     if ((int)$wiki->forceformat == 1 && !empty($title)) {
         $newpageid = $wikipage->create_page($title);
-        $newtitle = $wikipage->get_title();
-        add_to_log($course->id, 'wiki', 'add page', "view.php?pageid=$newpageid", "$newtitle", $cm->id);
-        redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $newpageid);
+        add_to_log($course->id, 'wiki', 'add page', "view.php?pageid=".$newpageid, $newpageid, $cm->id);
+        redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid='.$newpageid);
     } else {
         // create link from moodle navigation block without pagetitle
         $wikipage->print_header();
diff --git a/mod/wiki/diff.php b/mod/wiki/diff.php
index 8c4d4a9fa58..c5eed893598 100644
--- a/mod/wiki/diff.php
+++ b/mod/wiki/diff.php
@@ -67,14 +67,13 @@ if ($compare >= $comparewith) {
 }
 
 require_login($course->id, true, $cm);
-add_to_log($course->id, "wiki", "diff", "diff.php?id=$cm->id", "$wiki->id");
 
 $wikipage = new page_wiki_diff($wiki, $subwiki, $cm);
 
 $wikipage->set_page($page);
 $wikipage->set_comparison($compare, $comparewith);
 
-add_to_log($course->id, "wiki", "view diff", "diff.php?pageid=$pageid&comparewith=$comparewith&compare=$compare", "$page->title", $cm->id);
+add_to_log($course->id, "wiki", "diff", "diff.php?pageid=".$pageid."&comparewith=".$comparewith."&compare=".$compare, $pageid, $cm->id);
 
 $wikipage->print_header();
 
diff --git a/mod/wiki/edit.php b/mod/wiki/edit.php
index 410cbc3fc52..7be82afcb38 100644
--- a/mod/wiki/edit.php
+++ b/mod/wiki/edit.php
@@ -85,7 +85,7 @@ if ($option == get_string('save', 'wiki')) {
     $wikipage->set_page($page);
     $wikipage->set_newcontent($newcontent);
     $wikipage->set_upload(true);
-    add_to_log($course->id, 'wiki', 'update', "view.php?pageid=$pageid", "$page->title", $cm->id);
+    add_to_log($course->id, 'wiki', 'edit', "view.php?pageid=".$pageid, $pageid, $cm->id);
 } else {
     if ($option == get_string('preview')) {
         if (!confirm_sesskey()) {
diff --git a/mod/wiki/history.php b/mod/wiki/history.php
index 5ddc2bea033..59851b1e2a8 100644
--- a/mod/wiki/history.php
+++ b/mod/wiki/history.php
@@ -61,7 +61,7 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST)
 require_login($course->id, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);
-add_to_log($course->id, 'wiki', 'view history', "history.php?pageid=$pageid", "$page->title", $cm->id);
+add_to_log($course->id, 'wiki', 'history', "history.php?pageid=".$pageid, $pageid, $cm->id);
 
 /// Print the page header
 $wikipage = new page_wiki_history($wiki, $subwiki, $cm);
diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index 9ebb6c16ffb..7f13ee24a4e 100644
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -45,7 +45,7 @@ require_login($course->id, true);
 $PAGE->set_pagelayout('incourse');
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 
-add_to_log($course->id, 'wiki', 'view all', "index.php?id=$id", "");
+add_to_log($course->id, 'wiki', 'view', "index.php?id=".$id, "");
 
 /// Get all required stringswiki
 $strwikis = get_string("modulenameplural", "wiki");
diff --git a/mod/wiki/instancecomments.php b/mod/wiki/instancecomments.php
index 78043b2a918..4467b171e96 100644
--- a/mod/wiki/instancecomments.php
+++ b/mod/wiki/instancecomments.php
@@ -82,7 +82,6 @@ if ($action == 'add' || $action == 'edit') {
 }
 
 if ($action == 'delete') {
-    add_to_log($course->id, 'wiki', 'delete comment', "comments.php?pageid=$pageid", "$page->title", $cm->id);
     $comm->set_action($action, $commentid, 0);
 } else {
     if (empty($newcontent)) {
@@ -94,14 +93,13 @@ if ($action == 'delete') {
     }
 
     if ($action == 'edit') {
-        add_to_log($course->id, 'wiki', 'update comment', "comments.php?pageid=$pageid", "$page->title", $cm->id);
         $comm->set_action($action, $id, $content);
     } else {
-        add_to_log($course->id, 'wiki', 'add comment', "comments.php?pageid=$pageid", "$page->title", $cm->id);
         $action = 'add';
         $comm->set_action($action, 0, $content);
     }
 }
+add_to_log($course->id, 'wiki', 'comment', "comments.php?pageid=".$pageid, $pageid, $cm->id);
 
 $comm->print_header();
 $comm->print_content();
diff --git a/mod/wiki/map.php b/mod/wiki/map.php
index cad80f23f01..edd49d1c8b8 100644
--- a/mod/wiki/map.php
+++ b/mod/wiki/map.php
@@ -56,14 +56,11 @@ if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
 require_login($course->id, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);
-add_to_log($course->id, "wiki", "map", "map.php?id=$cm->id", "$wiki->id");
 
-/// Print page header
-
-/// Finish the page
 $wikipage = new page_wiki_map($wiki, $subwiki, $cm);
-add_to_log($course->id, "wiki", "view map", "map.php?pageid=$pageid", "$page->title", $cm->id);
+add_to_log($course->id, "wiki", "map", "map.php?pageid=".$pageid, $pageid, $cm->id);
 
+// Print page header
 $wikipage->set_view($option);
 $wikipage->set_page($page);
 $wikipage->print_header();
diff --git a/mod/wiki/overridelocks.php b/mod/wiki/overridelocks.php
index 37bd0bdcd48..f725976f3de 100644
--- a/mod/wiki/overridelocks.php
+++ b/mod/wiki/overridelocks.php
@@ -77,7 +77,7 @@ $wikipage->set_page($page);
 if (!empty($section)) {
     $wikipage->set_section($sectioncontent, $section);
 }
-add_to_log($course->id, "wiki", "overridelocks", "view.php?pageid=$pageid", "$page->title", $cm->id);
+add_to_log($course->id, "wiki", "overridelocks", "view.php?pageid=".$pageid, $pageid, $cm->id);
 
 $wikipage->print_header();
 
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index a44ecc8bc45..6085483f0e1 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -220,14 +220,6 @@ abstract class page_wiki {
         $PAGE->set_title($this->title);
     }
 
-    /**
-     * returns title of the wiki page
-     * @return string
-     */
-    function get_title() {
-        return $this->title;
-    }
-
     /**
      * Method to set current group id
      * @param int $gid Current group id
diff --git a/mod/wiki/prettyview.php b/mod/wiki/prettyview.php
index 0b4ee60355b..6556ed76488 100644
--- a/mod/wiki/prettyview.php
+++ b/mod/wiki/prettyview.php
@@ -59,7 +59,7 @@ require_capability('mod/wiki:viewpage', $context);
 $wikipage = new page_wiki_prettyview($wiki, $subwiki, $cm);
 
 $wikipage->set_page($page);
-add_to_log($course->id, "wiki", "view pretty", "prettyview.php?pageid=$pageid", "$page->title", $cm->id);
+add_to_log($course->id, "wiki", "view", "prettyview.php?pageid=".$pageid, $pageid, $cm->id);
 
 $wikipage->print_header();
 $wikipage->print_content();
diff --git a/mod/wiki/restoreversion.php b/mod/wiki/restoreversion.php
index 3b03fbd2f11..eba4e2379f9 100644
--- a/mod/wiki/restoreversion.php
+++ b/mod/wiki/restoreversion.php
@@ -75,7 +75,7 @@ if ($confirm) {
     $wikipage->set_versionid($versionid);
 
 }
-add_to_log($course->id, "wiki", "restore", "view.php?pageid=$pageid", "$page->title : $versionid", $cm->id);
+add_to_log($course->id, "wiki", "restore", "view.php?pageid=".$pageid, $pageid, $cm->id);
 
 $wikipage->print_header();
 $wikipage->print_content();
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 7cd5581b323..85e81e8f500 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -293,11 +293,11 @@ $wikipage->set_gid($currentgroup);
 $wikipage->set_page($page);
 
 if($pageid) {
-    add_to_log($course->id, 'wiki', 'view', "view.php?pageid=$pageid", "$page->title", $cm->id);
+    add_to_log($course->id, 'wiki', 'view', "view.php?pageid=".$pageid, $pageid, $cm->id);
 } else if($id) {
-    add_to_log($course->id, 'wiki', 'view', "view.php?id=$id", "$page->title", $cm->id);
+    add_to_log($course->id, 'wiki', 'view', "view.php?id=".$id, $id, $cm->id);
 } else if($wid && $title) {
-    add_to_log($course->id, 'wiki', 'view', "view.php?wid=$wid&title=$title", "$page->title", $cm->id);
+    add_to_log($course->id, 'wiki', 'view', "view.php?wid=".$wid."&title=".$title, $wid, $cm->id);
 }
 
 $wikipage->print_header();
diff --git a/mod/wiki/viewversion.php b/mod/wiki/viewversion.php
index ef2977ae017..fb36789e173 100644
--- a/mod/wiki/viewversion.php
+++ b/mod/wiki/viewversion.php
@@ -59,16 +59,15 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
 $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
 require_login($course->id, true, $cm);
-add_to_log($course->id, "wiki", "history", "history.php?id=$cm->id", "$wiki->id");
 
-/// Print the page header
 $wikipage = new page_wiki_viewversion($wiki, $subwiki, $cm);
 
 $wikipage->set_page($page);
 $wikipage->set_versionid($versionid);
 
-add_to_log($course->id, "wiki", "view version", "viewversion.php?pageid=$pageid&versionid=$versionid", "$page->title", $cm->id);
+add_to_log($course->id, "wiki", "history", "viewversion.php?pageid=".$pageid."&versionid=".$versionid, $pageid, $cm->id);
 
+// Print the page header
 $wikipage->print_header();
 $wikipage->print_content();