From c84a682a6b7977b5dc3b3d4da6da0b72cc6b72ce Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Tue, 8 Jan 2019 11:57:35 -0700
Subject: [PATCH] Remove getCleanTitle() and move title cleanup code to
 getTitle()

---
 action.php       |  6 +++---
 lib/Note.lib.php | 11 +----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/action.php b/action.php
index ae0b1a7..07e41c6 100644
--- a/action.php
+++ b/action.php
@@ -77,20 +77,20 @@ switch ($VARS['action']) {
         switch ($VARS['type']) {
             case "html":
                 header("Content-Type: text/html; charset=UTF-8");
-                header("Content-disposition: attachment; filename=\"" . $note->getCleanTitle() . "_" . $note->getModified() . ".html\"");
+                header("Content-disposition: attachment; filename=\"" . $note->getTitle() . "_" . $note->getModified() . ".html\"");
                 echo $note->getHTML(false);
                 break;
             case "odt":
                 if ($SETTINGS['pandoc'] != "") {
                     header("Content-Type: application/vnd.oasis.opendocument.text");
-                    header("Content-disposition: attachment; filename=\"" . $note->getCleanTitle() . "_" . $note->getModified() . ".odt\"");
+                    header("Content-disposition: attachment; filename=\"" . $note->getTitle() . "_" . $note->getModified() . ".odt\"");
                     $pandoc = new Pandoc\Pandoc();
                     echo $pandoc->convert($note->getText(), "markdown_github", "odt");
                     break;
                 }
             default:
                 header("Content-Type: text/markdown; charset=UTF-8");
-                header("Content-disposition: attachment; filename=\"" . $note->getCleanTitle() . "_" . $note->getModified() . ".md\"");
+                header("Content-disposition: attachment; filename=\"" . $note->getTitle() . "_" . $note->getModified() . ".md\"");
                 echo $note->getText();
         }
         break;
diff --git a/lib/Note.lib.php b/lib/Note.lib.php
index a35366e..ba10299 100644
--- a/lib/Note.lib.php
+++ b/lib/Note.lib.php
@@ -131,7 +131,7 @@ class Note {
                 . "<link rel=\"schema.dcterms\" href=\"http://purl.org/dc/terms/\">\n"
                 . "<meta name=\"dcterms.modified\" content=\"" . date("Y-m-d", strtotime($this->getModified())) . "\">\n"
                 . "\n"
-                . "<title>" . $this->getCleanTitle() . "</title>\n"
+                . "<title>" . $this->getTitle() . "</title>\n"
                 . "\n"
                 . $safehtml;
         return $document;
@@ -184,15 +184,6 @@ class Note {
                 $title = explode("\n", $this->getText())[0];
             }
         }
-        return $title;
-    }
-
-    /**
-     * Get the note title stripped of Markdown and trimmed
-     * @return string
-     */
-    public function getCleanTitle(): string {
-        $title = $this->getTitle();
         $title = str_replace(["*", "#", "_", "`"], "", $title);
         $title = preg_replace([
             "/^- \[ \] /m",