Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Made diff more usable for HTML: may fix Bug #1530 - Wiki diffs useles…

…s when using HTML editor
  • Loading branch information...
commit 0dc1d6234075f51658ca67baaac32c7138505b37 1 parent dcc0c13
skaldrom authored
View
1  lang/en/wiki.php
@@ -161,6 +161,7 @@
$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';
View
2  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/
View
2  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 !");
}
}
View
6 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;
Please sign in to comment.
Something went wrong with that request. Please try again.