From: Dylan Lloyd <dylan@dylansserver.com>
Date: Tue, 7 Feb 2012 13:04:10 +0000 (-0500)
Subject: Merge branch 'dev' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;ds=sidebyside;h=eb9db23304d0f3ad3462bf192c6c0837cb79e6a7;hp=-c;p=dylansserver.git

Merge branch 'dev' into live
---

eb9db23304d0f3ad3462bf192c6c0837cb79e6a7
diff --combined index.php
index 485b063,58b10f6..8bd3f6c
--- a/index.php
+++ b/index.php
@@@ -163,7 -163,7 +163,7 @@@ class index extends cms 
          </li>
  
          <li><a href=
-         "git">git://dylansserver.com</a></li>
+         "/git/">git://dylansserver.com</a></li>
  
          <li>
            <h3>some notes:</h3>
@@@ -435,8 -435,8 +435,8 @@@ class note extends cms 
        // and a default author needs to be set
        // for no-javascript users.
        $stmt->bind_param('sss',
 -                          htmlspecialchars($_POST['name']),
 -                          htmlspecialchars($_POST['text']),
 +                          $_POST['name'],
 +                          $_POST['text'],
                          $this->id);
        $stmt->execute();
      }
@@@ -491,7 -491,7 +491,7 @@@ END_OF_NAVIGATION
        $date_posted = $entry['date_posted'];
        $author = $entry['author'];
        $text = htmlspecialchars($entry['text']);
 -      $head = "<h3>$author</h3>";
 +      $head = "<h3>" . htmlspecialchars($author) . "</h3>";
        echo <<<END_OF_COMMENT
        <div class='comment'>
        $head