# HG changeset patch
# User Dan
# Date 1191792527 14400
# Node ID 4c19952406db0dec093ce789686d41751fc5cd2c
# Parent  1bc7e849a264616c37d7ee135d4a29f8b20d96d5# Parent  492510dddc34ce59916c5ea9ef9ebe0a69a077b7
Merging in latest changes from stable

diff -r 1bc7e849a264 -r 4c19952406db .hgtags
--- a/.hgtags	Sun Oct 07 17:22:25 2007 -0400
+++ b/.hgtags	Sun Oct 07 17:28:47 2007 -0400
@@ -5,3 +5,4 @@
 6f0bbf88c3251ca597cb76ac8b59a1ee61d6dd3d rebrand
 0b5244001799fa29e83bf06c5f14eb69350f171c rebrand
 42c6c83b8a004163c9cc2d85f3c8eada3b73adf6 rebrand
+d53cc29308f4f4b97fc6d054e9e0855f37137409 rebrand
diff -r 1bc7e849a264 -r 4c19952406db ajax.php
--- a/ajax.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/ajax.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/captcha.php
--- a/includes/captcha.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/captcha.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/clientside/jsres.php
--- a/includes/clientside/jsres.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/clientside/jsres.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/comment.php
--- a/includes/comment.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/comment.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/common.php
--- a/includes/common.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/common.php	Sun Oct 07 17:28:47 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
@@ -23,7 +23,7 @@
   exit;
 }
 
-$version = '1.0.2';
+$version = '1.1.1';
 
 function microtime_float()
 {
diff -r 1bc7e849a264 -r 4c19952406db includes/constants.php
--- a/includes/constants.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/constants.php	Sun Oct 07 17:28:47 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
  *
@@ -70,7 +70,7 @@
 define('MAX_PMS_PER_BATCH', 7); // The maximum number of users that users can send PMs to in one go; restriction does not apply to users with mod_misc rights
 define('SEARCH_RESULTS_PER_PAGE', 10);
 define('MYSQL_MAX_PACKET_SIZE', 1048576); // 1MB; this is the default in MySQL 4.x I think
-define('SEARCH_MODE', 'FULLTEXT'); // Can be FULLTEXT or BUILTIN
+define('SEARCH_MODE', 'BUILTIN'); // Can be FULLTEXT or BUILTIN
 
 // Sidebar
 
diff -r 1bc7e849a264 -r 4c19952406db includes/dbal.php
--- a/includes/dbal.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/dbal.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/email.php
--- a/includes/email.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/email.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/functions.php
diff -r 1bc7e849a264 -r 4c19952406db includes/graphs.php
--- a/includes/graphs.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/graphs.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/js-compressor.php
--- a/includes/js-compressor.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/js-compressor.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/pageprocess.php
--- a/includes/pageprocess.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/pageprocess.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/pageutils.php
--- a/includes/pageutils.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/pageutils.php	Sun Oct 07 17:28:47 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
  * pageutils.php - a class that handles raw page manipulations, used mostly by AJAX requests or their old-fashioned form-based counterparts
  *
diff -r 1bc7e849a264 -r 4c19952406db includes/paths.php
--- a/includes/paths.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/paths.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/plugins.php
--- a/includes/plugins.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/plugins.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/render.php
diff -r 1bc7e849a264 -r 4c19952406db includes/search.php
--- a/includes/search.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/search.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/sessions.php
diff -r 1bc7e849a264 -r 4c19952406db includes/stats.php
--- a/includes/stats.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/stats.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/tagcloud.php
--- a/includes/tagcloud.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/tagcloud.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db includes/template.php
diff -r 1bc7e849a264 -r 4c19952406db includes/wikiengine/Tables.php
--- a/includes/wikiengine/Tables.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/includes/wikiengine/Tables.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db index.php
diff -r 1bc7e849a264 -r 4c19952406db install.php
--- a/install.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/install.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db plugins/SpecialAdmin.php
--- a/plugins/SpecialAdmin.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/plugins/SpecialAdmin.php	Sun Oct 07 17:28:47 2007 -0400
@@ -10,7 +10,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 1bc7e849a264 -r 4c19952406db plugins/admin/PageGroups.php
--- a/plugins/admin/PageGroups.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/plugins/admin/PageGroups.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db plugins/admin/SecurityLog.php
--- a/plugins/admin/SecurityLog.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/plugins/admin/SecurityLog.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/plugins/admin/UserManager.php	Sun Oct 07 17:28:47 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 1bc7e849a264 -r 4c19952406db upgrade.php
--- a/upgrade.php	Sun Oct 07 17:22:25 2007 -0400
+++ b/upgrade.php	Sun Oct 07 17:28:47 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
  *
@@ -61,7 +61,7 @@
 // Everything related to versions goes here!
 
 // Valid versions to upgrade from
-$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1');
+$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1', '1.0.2', 'Stable1.0ToUnstable1.1');
 
 // Basically a list of dependencies, which should be resolved automatically
 // If, for example, upgrading from 1.0b1 to 1.0RC1 requires one extra query that would not
@@ -76,9 +76,11 @@
     '1.0RC3' => Array('1.0'),
     '1.0' => Array('1.0.1'),
     '1.0.1' => Array('1.0.1.1'),
-    '1.0.1.1' => Array('1.0.2b1')
+    '1.0.1.1' => Array('1.0.2b1'),
+    '1.0.2b1' => Array('Stable1.0ToUnstable1.1'),
+    'Stable1.0ToUnstable1.1' => Array('1.1.1')
   );
-$this_version   = '1.0.2';
+$this_version   = '1.1.1';
 $func_list = Array(
     '1.0' => Array('u_1_0_1_update_del_votes'),
     '1.0b4' => Array('u_1_0_RC1_update_user_ids', 'u_1_0_RC1_add_admins_to_group', 'u_1_0_RC1_alter_files_table', 'u_1_0_RC1_destroy_session_cookie', 'u_1_0_RC1_set_contact_email', 'u_1_0_RC1_update_page_text'), // ,
diff -r 1bc7e849a264 -r 4c19952406db upgrade.sql
--- a/upgrade.sql	Sun Oct 07 17:22:25 2007 -0400
+++ b/upgrade.sql	Sun Oct 07 17:28:47 2007 -0400
@@ -3,7 +3,14 @@
 -- ALL NON-SQL LINES, even otherwise blank lines, must start with "--" or they will get sent to MySQL!
 -- Common tasks (version numbers)
 DELETE FROM {{TABLE_PREFIX}}config WHERE config_name='enano_version' OR config_name='enano_beta_version' OR config_name='enano_alpha_version' OR config_name='enano_rc_version';
-INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0.2' );
+INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.1.1' );
+---BEGIN Stable1.0ToUnstable1.1---
+UPDATE {{TABLE_PREFIX}}groups SET group_id=9998 WHERE group_id=4;
+UPDATE {{TABLE_PREFIX}}group_members SET group_id=9998 WHERE group_id=4;
+INSERT INTO {{TABLE_PREFIX}}groups(group_id,group_name,group_type,system_group) VALUES(4, 'Regular members', 3, 1);
+---END Stable1.0ToUnstable1.1---
+---BEGIN 1.0.2---
+---END 1.0.2---
 ---BEGIN 1.0.2b1---
 -- This is really optional, but could reduce confusion if regex page groups get truncated for no apparent reason.
 ALTER TABLE {{TABLE_PREFIX}}page_groups MODIFY COLUMN pg_target text DEFAULT NULL;