# HG changeset patch
# User Dan
# Date 1194089411 14400
# Node ID 0eca1498a77b057dfe685447666668e3942c14ba
# Parent  0e647852100437539c4ebc8ba1fc3f3f300faf5e# Parent  861807631f70218bf8f1cfef0553a0d9cee518d6
Merging in fixes from rev. 207

diff -r 0e6478521004 -r 0eca1498a77b ajax.php
diff -r 0e6478521004 -r 0eca1498a77b includes/clientside/static/misc.js
diff -r 0e6478521004 -r 0eca1498a77b includes/common.php
diff -r 0e6478521004 -r 0eca1498a77b includes/functions.php
--- a/includes/functions.php	Sat Nov 03 07:20:32 2007 -0400
+++ b/includes/functions.php	Sat Nov 03 07:30:11 2007 -0400
@@ -2827,6 +2827,8 @@
   {
     $js =& $jscript[2][$i];
     
+    // echo('<pre>' . "-----------------------------------------------------------------------------\n" . htmlspecialchars($js) . '</pre>');
+    
     // for line optimization, explode it
     $particles = explode("\n", $js);
     
diff -r 0e6478521004 -r 0eca1498a77b includes/pageutils.php
diff -r 0e6478521004 -r 0eca1498a77b includes/render.php
--- a/includes/render.php	Sat Nov 03 07:20:32 2007 -0400
+++ b/includes/render.php	Sat Nov 03 07:30:11 2007 -0400
@@ -708,6 +708,7 @@
       ':-/'     => 'face-plain.png',
       ':joke:'  => 'face-plain.png',
       ']:-&gt;' => 'face-devil-grin.png',
+      ']:->'    => 'face-devil-grin.png',
       ':kiss:'  => 'face-kiss.png',
       ':-P'     => 'face-tongue-out.png',
       ':P'      => 'face-tongue-out.png',
diff -r 0e6478521004 -r 0eca1498a77b includes/sessions.php
diff -r 0e6478521004 -r 0eca1498a77b includes/template.php
diff -r 0e6478521004 -r 0eca1498a77b index.php
diff -r 0e6478521004 -r 0eca1498a77b install.php
diff -r 0e6478521004 -r 0eca1498a77b plugins/SpecialAdmin.php
diff -r 0e6478521004 -r 0eca1498a77b plugins/SpecialUserFuncs.php
--- a/plugins/SpecialUserFuncs.php	Sat Nov 03 07:20:32 2007 -0400
+++ b/plugins/SpecialUserFuncs.php	Sat Nov 03 07:30:11 2007 -0400
@@ -4,13 +4,13 @@
 Plugin URI: http://enanocms.org/
 Description: Provides the pages Special:Login, Special:Logout, Special:Register, and Special:Preferences.
 Author: Dan Fuhry
-Version: 1.0.1
+Version: 1.0.2
 Author URI: http://enanocms.org/
 */
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 release candidate 2
+ * Version 1.0.2
  * Copyright (C) 2006-2007 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r 0e6478521004 -r 0eca1498a77b upgrade.php
diff -r 0e6478521004 -r 0eca1498a77b upgrade.sql