Merge branch 'dev' into live

[dylansserver.git] / index.php

diff --git a/index.php b/index.php
index 0355694..e58f737 100644 (file)
--- a/index.php
+++ b/index.php
@@ -243,14 +243,15 @@ class page extends cms {
     $this->scripts = "
         <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
         <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
-        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'></script>
-        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'></link>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
         <script type='text/javascript'>
           function highlight() {
             SyntaxHighlighter.autoloader(
              'js /includes/syntax/scripts/shBrushJScript.js',
              'bash /includes/syntax/scripts/shBrushBash.js',
-             'sql /includes/syntax/scripts/shBrushSql.js');
+             'sql /includes/syntax/scripts/shBrushSql.js',
+             'cpp /includes/syntax/scripts/shBrushCpp.js');
             SyntaxHighlighter.defaults['gutter'] = false;
             SyntaxHighlighter.defaults['toolbar'] = false;
             SyntaxHighlighter.all();
@@ -345,14 +346,15 @@ class note extends cms {
       $this->scripts = "
         <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
         <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
-        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'></script>
-        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'></link>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
         <script type='text/javascript'>
           function highlight() {
             SyntaxHighlighter.autoloader(
              'js /includes/syntax/scripts/shBrushJScript.js',
              'bash /includes/syntax/scripts/shBrushBash.js',
-             'sql /includes/syntax/scripts/shBrushSql.js');
+             'sql /includes/syntax/scripts/shBrushSql.js',
+             'cpp /includes/syntax/scripts/shBrushCpp.js');
             SyntaxHighlighter.defaults['gutter'] = false;
             SyntaxHighlighter.defaults['toolbar'] = false;
             SyntaxHighlighter.all();
@@ -361,7 +363,7 @@ class note extends cms {
       ";
 
     if (isset($_GET['comments'])) {
-      $this->scripts += "
+      $this->scripts .= "
         <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
         <script type='text/javascript' src='/includes/comment.js'></script>";
     }