summaryrefslogtreecommitdiffstats
path: root/system/application/models
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xssn.at>2010-06-23 22:45:16 +0200
committerFlorian Pritz <bluewind@xssn.at>2010-06-23 22:45:16 +0200
commit2aec1077aa706bb4ae45e635efa8dd8c16327830 (patch)
treeb0aeffb7f9eecc57594fda2db948e032ba9a468a /system/application/models
parentb22f33dcc5acc2bf102b0cade7061a04096a5acc (diff)
don't wrap rendered markdown code into <pre>
Signed-off-by: Florian Pritz <bluewind@xssn.at>
Diffstat (limited to 'system/application/models')
-rw-r--r--system/application/models/file_mod.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/application/models/file_mod.php b/system/application/models/file_mod.php
index 3aca81605..645858ecd 100644
--- a/system/application/models/file_mod.php
+++ b/system/application/models/file_mod.php
@@ -177,7 +177,7 @@ class File_mod extends Model {
header("Content-Type: text/html\n");
echo $this->load->view('file/html_header', $data, true);
if ($mode == "rmd") {
- echo '<td class="markdownrender"><pre>'."\n";
+ echo '<td class="markdownrender">'."\n";
passthru('/usr/bin/perl /usr/bin/perlbin/vendor/Markdown.pl '.escapeshellarg($file));
} else {
echo '<td class="numbers"><pre>';
@@ -186,6 +186,7 @@ class File_mod extends Model {
passthru('/usr/bin/perl -ne \'print "<a href=\"#n$.\" class=\"no\" id=\"n$.\" name=\"n$.\">$.</a>\n"\' '.escapeshellarg($file));
echo '</pre></td><td class="code"><pre>'."\n";
echo shell_exec(FCPATH.'scripts/syntax-highlighting.sh '.escapeshellarg($filedata['filename']).'.'.escapeshellarg($mode).' < '.escapeshellarg($file));
+ echo '</pre>';
}
echo $this->load->view('file/html_footer', $data, true);
} else {