# HG changeset patch
# User Dan
# Date 1192931486 14400
# Node ID eec079676fe77b8d5a6e90de63cc49986ceea58e
# Parent  bf0fdec102e9072d2cf661231e341dcbf238e441# Parent  db8a849ad4c9310d652cd62098eaffe6d5a2ce16
Merging in changes from db8a849ad4c9

diff -r bf0fdec102e9 -r eec079676fe7 .hgtags
--- a/.hgtags	Sat Oct 20 21:46:05 2007 -0400
+++ b/.hgtags	Sat Oct 20 21:51:26 2007 -0400
@@ -5,3 +5,4 @@
 6f0bbf88c3251ca597cb76ac8b59a1ee61d6dd3d rebrand
 0b5244001799fa29e83bf06c5f14eb69350f171c rebrand
 42c6c83b8a004163c9cc2d85f3c8eada3b73adf6 rebrand
+d53cc29308f4f4b97fc6d054e9e0855f37137409 rebrand
diff -r bf0fdec102e9 -r eec079676fe7 ajax.php
diff -r bf0fdec102e9 -r eec079676fe7 includes/captcha.php
--- a/includes/captcha.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/captcha.php	Sat Oct 20 21:51:26 2007 -0400
@@ -1,7 +1,8 @@
 <?php
+
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * Copyright (C) 2006-2007 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
diff -r bf0fdec102e9 -r eec079676fe7 includes/clientside/jsres.php
--- a/includes/clientside/jsres.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/clientside/jsres.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * Copyright (C) 2006-2007 Dan Fuhry
  * jsres.php - the Enano client-side runtime, a.k.a. AJAX on steroids
  *
@@ -40,7 +40,7 @@
 {
   echo "/*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * [Aggressively compressed] Javascript client code
  * Copyright (C) 2006-2007 Dan Fuhry
  * Enano is Free Software, licensed under the GNU General Public License; see http://enanocms.org/ for details.
diff -r bf0fdec102e9 -r eec079676fe7 includes/comment.php
--- a/includes/comment.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/comment.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 includes/common.php
diff -r bf0fdec102e9 -r eec079676fe7 includes/constants.php
--- a/includes/constants.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/constants.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * Copyright (C) 2006-2007 Dan Fuhry
  * constants.php - important defines used Enano-wide
  *
diff -r bf0fdec102e9 -r eec079676fe7 includes/dbal.php
--- a/includes/dbal.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/dbal.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 includes/email.php
--- a/includes/email.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/email.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 includes/functions.php
diff -r bf0fdec102e9 -r eec079676fe7 includes/graphs.php
--- a/includes/graphs.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/graphs.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 includes/js-compressor.php
--- a/includes/js-compressor.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/js-compressor.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * Copyright (C) 2006-2007 Dan Fuhry
  * Javascript compression library - used to compact the client-side Javascript code (all 72KB of it!) to save some bandwidth
  *
diff -r bf0fdec102e9 -r eec079676fe7 includes/pageprocess.php
--- a/includes/pageprocess.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/pageprocess.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * pageprocess.php - intelligent retrieval of pages
  * Copyright (C) 2006-2007 Dan Fuhry
  *
diff -r bf0fdec102e9 -r eec079676fe7 includes/pageutils.php
diff -r bf0fdec102e9 -r eec079676fe7 includes/paths.php
--- a/includes/paths.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/paths.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /**
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * Copyright (C) 2006-2007 Dan Fuhry
  * paths.php - The part of Enano that actually manages content. Everything related to page handling and namespaces is in here.
  *
diff -r bf0fdec102e9 -r eec079676fe7 includes/plugins.php
--- a/includes/plugins.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/plugins.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 includes/render.php
diff -r bf0fdec102e9 -r eec079676fe7 includes/search.php
--- a/includes/search.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/search.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * Copyright (C) 2006-2007 Dan Fuhry
  * search.php - algorithm used to search pages
  *
diff -r bf0fdec102e9 -r eec079676fe7 includes/sessions.php
diff -r bf0fdec102e9 -r eec079676fe7 includes/stats.php
--- a/includes/stats.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/stats.php	Sat Oct 20 21:51:26 2007 -0400
@@ -1,7 +1,8 @@
 <?php
+
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * Copyright (C) 2006-2007 Dan Fuhry
  * stats.php - handles statistics for pages (disablable in the admin CP)
  *
diff -r bf0fdec102e9 -r eec079676fe7 includes/tagcloud.php
--- a/includes/tagcloud.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/tagcloud.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 includes/template.php
diff -r bf0fdec102e9 -r eec079676fe7 includes/wikiengine/Tables.php
--- a/includes/wikiengine/Tables.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/includes/wikiengine/Tables.php	Sat Oct 20 21:51:26 2007 -0400
@@ -1,8 +1,8 @@
 <?php
 
-/**
+/*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 index.php
diff -r bf0fdec102e9 -r eec079676fe7 install.php
--- a/install.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/install.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * Copyright (C) 2006-2007 Dan Fuhry
  * install.php - handles everything related to installation and initial configuration
  *
@@ -23,7 +23,7 @@
 
 define('IN_ENANO_INSTALL', 'true');
 
-define('ENANO_VERSION', '1.0.2');
+define('ENANO_VERSION', '1.1.1');
 // In beta versions, define ENANO_BETA_VERSION here
 
 if(!defined('scriptPath')) {
@@ -260,7 +260,7 @@
 }
 
 $template = new template_nodb();
-$template->load_theme('oxygen', 'bleu', false);
+$template->load_theme('stpatty', 'shamrock', false);
 
 $modestrings = Array(
               'welcome' => 'Welcome',
@@ -313,10 +313,9 @@
   case 'welcome':
     ?>
     <div style="text-align: center; margin-top: 10px;">
-      <img alt="[ Enano CMS Project logo ]" src="images/enano-artwork/installer-greeting-blue.png" style="display: block; margin: 0 auto; padding-left: 100px;" />
+      <img alt="[ Enano CMS Project logo ]" src="images/enano-artwork/installer-greeting-green.png" style="display: block; margin: 0 auto; padding-left: 100px;" />
       <h2>Welcome to Enano</h2>
-      <h3>version 1.0.2 &ndash; stable<br />
-      <span style="font-weight: normal;">also affectionately known as "coblynau" <tt>:)</tt></span></h3>
+      <h3>version 1.1.1 &ndash; unstable</h3>
       <?php
       if ( file_exists('./_nightly.php') )
       {
diff -r bf0fdec102e9 -r eec079676fe7 plugins/SpecialAdmin.php
diff -r bf0fdec102e9 -r eec079676fe7 plugins/admin/PageGroups.php
diff -r bf0fdec102e9 -r eec079676fe7 plugins/admin/SecurityLog.php
--- a/plugins/admin/SecurityLog.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/plugins/admin/SecurityLog.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/plugins/admin/UserManager.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * 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 bf0fdec102e9 -r eec079676fe7 upgrade.php
--- a/upgrade.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/upgrade.php	Sat Oct 20 21:51:26 2007 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.2 (Coblynau)
+ * Version 1.1.1
  * upgrade.php - upgrade script
  * Copyright (C) 2006-2007 Dan Fuhry
  *