Merge branch 'uiredesign' of /var/www/trunk into uiredesign

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

diff --git a/actions/doc.php b/actions/doc.php
index a23cf9ad0716ccc1d2baa55e51e14478775a6a23..3d14b25b8a194e6d5a2563e31b727dc907c7eb82 100644 (file)
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -19,25 +19,22 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once('markdown.php');
+class DocAction extends Action
+{
 
-class DocAction extends Action {
-
-       function handle($args) {
-               parent::handle($args);
-               $title = $this->trimmed('title');
-               $filename = INSTALLDIR.'/doc/'.$title;
-               if (!file_exists($filename)) {
-                       common_user_error(_t('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', '$config[\'\\1\'][\'\\2\']', $c);
-               $output = Markdown($c);
-               common_show_header(_t(ucfirst($title)));
-               common_raw($output);
-               common_show_footer();
-       }
-}
\ No newline at end of file
+    function handle($args)
+    {
+        parent::handle($args);
+        $title = $this->trimmed('title');
+        $filename = INSTALLDIR.'/doc/'.$title;
+        if (!file_exists($filename)) {
+            $this->clientError(_('No such document.'));
+            return;
+        }
+        $c = file_get_contents($filename);
+        $output = common_markup_to_html($c);
+        common_show_header(_(ucfirst($title)));
+        $this->raw($output);
+        common_show_footer();
+    }
+}