Item12952: add missing newline into changes list, change empty line t…

…o use a <br> instead of a <p>
foswiki · Sep 25, 2014 · 2b3e040 · 2b3e040
1 parent 975f24e
commit 2b3e040
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/ConfigurePlugin/pub/System/ConfigurePlugin/render_tml.uncompressed.js b/ConfigurePlugin/pub/System/ConfigurePlugin/render_tml.uncompressed.js
@@ -20,7 +20,7 @@ As per the GPL, removal of this notice is prohibited.
 TML (subset) renderer. Handles a simple subset of TML:
 
 - Single level of lists (ul and ol)
-- Blank line -> <p />
+- Blank line -> <br />
 - Simple tables
 - Text styling e.g. *bold*, =code= etc
 - URL links [[http://that][text description]]
@@ -96,7 +96,7 @@ var TML = {
             line = lines[i];
 
             if (/^\s*$/.test(line)) {
-                lines[i] = "<p />";
+                lines[i] = "<br />";
                 continue;
             }
 

diff --git a/core/lib/Foswiki/Configure/Reporter.pm b/core/lib/Foswiki/Configure/Reporter.pm
@@ -144,14 +144,14 @@ sub text {
     my ( $this, $level ) = @_;
 
     if ( $level eq 'changes' ) {
-        my $text = "*Changed:*\n";
+        my $text = "---+++ Changed\n";
         while ( my ( $k, $v ) = each %{ $this->{changes} } ) {
-            $text .= "   * $k = $v";
+            $text .= "   * $k = $v\n";
         }
         return $text;
     }
 
-    return join( "\n", @{ $this->{$level} } );
+    return join( "\n\n", @{ $this->{$level} } );
 }
 
 1;

diff --git a/core/lib/Foswiki/Configure/Wizards/AutoConfigureEmail.pm b/core/lib/Foswiki/Configure/Wizards/AutoConfigureEmail.pm
@@ -117,6 +117,11 @@ NOCERT
             );
         }
     }
+    else {
+        $reporter->WARN(
+"{SMTP}{MAILHOST} is not defined, so cannot use SMTP. Falling back to mail program"
+        );
+    }
 
     if ( !$ok && _autoconfigProgram($reporter) ) {
         $ok = 1;