# HG changeset patch
# User Dan
# Date 1196629256 18000
# Node ID 199b9708f4a2c50865d9ba7e8e8504787c134cd2
# Parent  e2cb5f1432c8665643a4708c6c4b3e54575d8aa9# Parent  a1ccf990db6ba341b06a04151af8a3ff2da9bb46
Merging in a couple more revisions from stable

diff -r e2cb5f1432c8 -r 199b9708f4a2 .hgtags
--- a/.hgtags	Sun Dec 02 16:00:10 2007 -0500
+++ b/.hgtags	Sun Dec 02 16:00:56 2007 -0500
@@ -8,4 +8,4 @@
 d53cc29308f4f4b97fc6d054e9e0855f37137409 rebrand
 90632c09ed7ec816da708df1341d9f4019de9adf feature-freeze
 f948557af0681389165a23419968965fcebcbdd0 devel-freeze
-c36c5034a80052b4dc4710a67513b5b6e3c2fc7b release
+95dc632bf0846b5a7d7d841a4fe9518964a1cc9a release
diff -r e2cb5f1432c8 -r 199b9708f4a2 includes/wikiengine/Tables.php
--- a/includes/wikiengine/Tables.php	Sun Dec 02 16:00:10 2007 -0500
+++ b/includes/wikiengine/Tables.php	Sun Dec 02 16:00:56 2007 -0500
@@ -277,6 +277,13 @@
 	 * @return HTML-encoded text fragment
 	 */
 	function encodeAttribute( $text ) {
+    
+    // In Enano 1.0.3, added this cheapo hack to keep ampersands
+    // from being double-sanitized. Thanks to markybob from #deluge.
+    $encValue = strtr( $text, array(
+      '&' => '&'
+    ) );
+    
 		$encValue = htmlspecialchars( $text );
 		
 		// Whitespace is normalized during attribute decoding,
diff -r e2cb5f1432c8 -r 199b9708f4a2 index.php
--- a/index.php	Sun Dec 02 16:00:10 2007 -0500
+++ b/index.php	Sun Dec 02 16:00:56 2007 -0500
@@ -50,7 +50,10 @@
   
   global $db, $session, $paths, $template, $plugins; // Common objects
   
-  if(!isset($_GET['do'])) $_GET['do'] = 'view';
+  if ( !isset($_GET['do']) )
+  {
+    $_GET['do'] = 'view';
+  }
   switch($_GET['do'])
   {
     default:
diff -r e2cb5f1432c8 -r 199b9708f4a2 upgrade.php
--- a/upgrade.php	Sun Dec 02 16:00:10 2007 -0500
+++ b/upgrade.php	Sun Dec 02 16:00:56 2007 -0500
@@ -121,6 +121,7 @@
 require(ENANO_ROOT.'/includes/plugins.php');
 require(ENANO_ROOT.'/includes/rijndael.php');
 require(ENANO_ROOT.'/includes/render.php');
+require(ENANO_ROOT.'/includes/search.php');
 $db = new mysql();
 $db->connect();