notice_inbox.id -> notice_inbox.notice_id

[quix0rs-gnu-social.git] / actions / doc.php

diff --git a/actions/doc.php b/actions/doc.php
index edb2cab62042dbae8d6142158e2f889fba421c0a..f3327048f271d09c87496f6e124af37996eadc18 100644 (file)
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -19,8 +19,6 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once('markdown.php');
-
 class DocAction extends Action {
 
        function handle($args) {
@@ -28,16 +26,13 @@ class DocAction extends Action {
                $title = $this->trimmed('title');
                $filename = INSTALLDIR.'/doc/'.$title;
                if (!file_exists($filename)) {
-                       common_user_error(_t('No such document.'));
+                       common_user_error(_('No such document.'));
                        return;
                }
                $c = file_get_contents($filename);
-               $c = preg_replace('/%%action.(\w+)%%/e', "common_local_url('\\1')", $c);
-               $c = preg_replace('/%%doc.(\w+)%%/e', "common_local_url('doc', array('title'=>'\\1'))", $c);
-               $c = preg_replace('/%%(\w+).(\w+)%%/e', 'common_config(\'\\1\', \'\\2\')', $c);
-               $output = Markdown($c);
-               common_show_header(_t(ucfirst($title)));
+               $output = common_markup_to_html($c);
+               common_show_header(_(ucfirst($title)));
                common_raw($output);
                common_show_footer();
        }
-}
\ No newline at end of file
+}