Made diff more usable for HTML: may fix Bug #1530 - Wiki diffs useless when using...

diff --git a/lang/en/wiki.php b/lang/en/wiki.php
index 8bf4c10e8bb16c47c32d9c3e36fb27a41c999503..4c655092b3dd16e53b60d69aec983ce3ca1bd2bd 100644 (file)
--- a/lang/en/wiki.php
+++ b/lang/en/wiki.php
@@ -161,6 +161,7 @@ $string['binimgtoolarge']='Image file is too large!';
 $string['binnoimg']='This is an inacceptable file format!';
 $string['browse']='Browse';
 $string['fetchback']='Fetch-back';
+$string['differences']="Differences between version \$a->new_ver and \$a->old_ver of \$a->pagename.";
 $string['diff']='Diff';
 $string['author']='Author';
 $string['created']='Created';

diff --git a/mod/wiki/TODO.txt b/mod/wiki/TODO.txt
index beff4a4e7bc7a2da8ff8febee030d38531d21a53..6ee32ca5788766d1f6c1564d7de7438bad514e77 100644 (file)
--- a/mod/wiki/TODO.txt
+++ b/mod/wiki/TODO.txt
@@ -19,5 +19,3 @@ Unassigned or not ready:
  
 ewiki Preparation:
   - Current Version: 1.01d
-  - rm -r example-1.php examples/ tools/ config.php
-  - rm -r fragments/ patches/ php-patches/ spages/

diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index 23644417352be8a9af350f4a6222a379e0fa26ec..9a9dbc0113d7471241cea2d162024203248c4621 100644 (file)
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -77,7 +77,7 @@
 
     # Check for dangerous events (hacking) !
     if(in_array($action,array("removepages","strippages","revertpages"))) {
-      if($wiki->wtype!="student" || !isteacher($course->id)) {
+      if($wiki->wtype!="student" && !isteacher($course->id)) {
         error("Hack attack detected !");
       }          
     }

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 84d93b8e540165c3394e79ded940fcf6844b9338..3e28baec5d689bccf091b1d0494434c677c28666 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -138,7 +138,7 @@
         include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/aview/backlinks.php");
         #include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/markup/css.php");
         include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/markup/footnotes.php");
-        include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/action/diff.php");
+        include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/moodle/diff.php");
         include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/page/pageindex.php");
         include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/page/orphanedpages.php");
         include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/moodle/wantedpages.php");
@@ -273,14 +273,14 @@
           $infoicon= '<img hspace=1 alt="'.get_string("pageinfo","wiki").'" height=16 width=16 border=0 src="'.$CFG->pixpath.'/i/info.gif">';
 
           if($ewiki_action!="edit" && !in_array($wikipage, $specialpages)) {          
-            $iconstr.='<a title="'.get_string("editthispage","wiki").'" href="'.EWIKI_SCRIPT.'&wikipage=edit/'.$ewiki_id.'">'.$editicon."</a>";
+            $iconstr.='<a title="'.get_string("editthispage","wiki").'" href="'.$ewbase.'&wikipage=edit/'.$ewiki_id.'">'.$editicon."</a>";
           }
           else {
             $iconstr.=$editicon;
           }
 
           if($ewiki_action!="info" && !in_array($wikipage, $specialpages)) {                      
-            $iconstr.='<a title="'.get_string("pageinfo","wiki").'" href="'.EWIKI_SCRIPT.'&wikipage=info/'.$ewiki_id.'">'.$infoicon."</a>";
+            $iconstr.='<a title="'.get_string("pageinfo","wiki").'" href="'.$ewbase.'&wikipage=info/'.$ewiki_id.'">'.$infoicon."</a>";
           }
           else {
             $iconstr.=$infoicon;