Fixed Bug #1548 - Empty lines inserted when using HTML Editor

diff --git a/lang/en/wiki.php b/lang/en/wiki.php
index c53c056cb99ddb981d510e9f5bb7831fad651b25..3da18795880066c7089b1f8300881d19c4e8f07b 100644 (file)
--- a/lang/en/wiki.php
+++ b/lang/en/wiki.php
@@ -172,6 +172,8 @@ $string['contentsize']='Content size';
 $string['pageslinkingto']="Pages linking to this page";
 $string['viewsmfor']="View sitemap for";
 $string['smfor']="Sitemap for";
+$string['cannotchangepage']="This page cannot be changed.";
+$string['errversionsave']="Sorry, while you edited this page someone else did already save a changed version. Please go back to the previous screen and copy your changes to your computers clipboard to insert it again after you reload the edit screen.";
 $string['uplinsect']="Upload into";
 $string['invalidroot']="You are not authorized to access the current root page so no sitemap can be created.";
 $string['thispageisntlinkedfromanywhereelse'] = 'This page isn\'t linked from anywhere else.';

diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index fb13f187b46df496c008216d391010a6eb6c7844..17c79c8edf721acb4e9bffd4ddafc837a8d7359b 100644 (file)
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -711,7 +711,8 @@ function ewiki_page_view($id, &$data, $action, $all=1) {
    if (!$all) {
       return($o);
    }
-
+   #### MOODLE CHANGE
+   $o.= "<br><br>";
    #-- control line + other per-page info stuff
    if ($pf_a = $ewiki_plugins["view_append"]) {
       ksort($pf_a);
@@ -1553,18 +1554,13 @@ function ewiki_page_edit_preview(&$data) {
            . "<hr noshade>"
            . "<div align=\"right\">" . ewiki_t("PREVIEW") . "</div><hr noshade><br>\n"
            . format_text($preview_text, $moodle_format)
-           . "<hr noshade><br>"
+           . "<br><br><hr noshade><br>"
            . "</div>"
    );
 #### END MOODLE CHANGES   
 }
 
 
-
-
-
-
-
 function ewiki_control_links($id, &$data, $action) {
 
    global $ewiki_plugins, $ewiki_ring, $ewiki_config;
@@ -2050,7 +2046,12 @@ function ewiki_format_close_para(&$ooo, &$s) {
    #-- output text block
    if (trim($s["para"])) {
       if (!$s["block"]) {
-         $s["para"] = "\n<p>\n" . ltrim($s["para"], "\n") . "</p>\n";
+         #### MOODLE CHANGES
+         global $ewiki_use_editor;
+         if(!$ewiki_use_editor) {
+           $s["para"] = "\n<p>\n" . ltrim($s["para"], "\n") . "</p>\n";
+         }
+         #### MOODLE CHANGES
       }
       #-- paragraph formation plugins
       if ($pf_a = $GLOBALS["ewiki_plugins"]["format_para"]) {