# HG changeset patch
# User Dan
# Date 1218508264 14400
# Node ID 17ebe24cdf850034836c0dc98ea918f0c2cd7168
# Parent  15dbbe7e767498ff6759be7dee1d79a7a69469e3
Rebranded as 1.1.5 (Caoineag alpha 5) and fixed a couple bugs related to CDN support in template_nodb and installerUI. Updated readme.

diff -r 15dbbe7e7674 -r 17ebe24cdf85 README
--- a/README	Mon Aug 11 21:43:04 2008 -0400
+++ b/README	Mon Aug 11 22:31:04 2008 -0400
@@ -1,5 +1,5 @@
 Enano CMS
-Version 1.1.4
+Version 1.1.5
 -----------------------------
 
 Thanks for downloading Enano! If you're looking for an installation guide,
@@ -62,7 +62,7 @@
 confused as to which one is the "real" Enano CMS. We also strongly recommend
 that you include a notice of non-endorsement from Dan Fuhry and the Enano
 Foundation and a disclaimer of liability for damages incurred through the use
-of the software.
+of the software. The Enano Team will not provide support for forks.
 
 As permitted by the GPL, you may charge for the service of downloading Enano
 from your server; however, you may not prevent others from distributing Enano
@@ -71,24 +71,26 @@
 CHANGES IN THIS RELEASE
 -----------------------------
 
-Please see <http://enanocms.org/Release_notes/1.1.4> for a list of changes in
+Please see <http://enanocms.org/Release_notes/1.1.5> for a list of changes in
 this release.
 
 UPGRADING FROM PREVIOUS RELEASES
 -----------------------------
 
-This tarball includes a very basic migration script that you can use to change
-a 1.0.x installation into a 1.1.x one. Make sure you're using the latest 1.0.x
-release (1.0.4 at the time of this writing) BEFORE you run the migration
-script. DO NOT UPGRADE A PRODUCTION SITE.
+This archive includes a script that can migrate an Enano 1.0.x installation to
+Enano 1.1. Before running the migration script, you should always be sure to
+upgrade to the latest version of Enano 1.0.x (1.0.4 "Ellyyllon" at the time of
+this writing). Migration is NOT REVERSIBLE. This is alpha-quality code. DO NOT
+UNDER ANY CIRCUMSTANCES UPGRADE A PRODUCTION SITE.
 
-As of 1.1.2, basic upgrade functionality is included and is considered highly
-experimental. Back up your entire database and Enano root before upgrading.
+As of Enano 1.1.2, upgrades from previous 1.1.x versions are supported. The API
+is considered fairly stable as of 1.1.4, but the interface is still a work in
+progress except for the installer UI core, which is quite close to final.
 
 TRANSLATING ENANO
 -----------------------------
 
-This is the only the fourth formal release of Enano that is localized. Right
+This is the only the fifth formal release of Enano that is localized. Right
 now since this is an alpha, you probably don't want to do any translation
 because you'll be doing a TON more strings at every release. HOWEVER, we're
 looking for people to sign up and volunteer for translation efforts later on.
@@ -121,6 +123,16 @@
 unless you copy over comment.tpl and acledit.tpl respectively from Oxygen or
 one of the other themes included with this 1.1.x package.
 
+PLUGIN DEVELOPMENT
+-----------------------------
+
+The plugin API in Enano 1.1 has been dramatically revamped from 1.0. Some
+effort has been made to allow 1.0.x plugins that don't hook very deeply to
+continue to work; however with all of the new functionality (localization
+especially) we recommend that developers take the time to learn how to use the
+new plugin management platform. This system is fully documented in the large
+comment block in plugins/admin/PluginManager.php.
+
 GETTING SUPPORT
 -----------------------------
 
diff -r 15dbbe7e7674 -r 17ebe24cdf85 ajax.php
--- a/ajax.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/ajax.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 cron.php
--- a/cron.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/cron.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/cache.php
--- a/includes/cache.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/cache.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/captcha.php
--- a/includes/captcha.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/captcha.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/captcha/engine_default.php
--- a/includes/captcha/engine_default.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/captcha/engine_default.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/captcha/engine_failsafe.php
--- a/includes/captcha/engine_failsafe.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/captcha/engine_failsafe.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/captcha/engine_potpourri.php
--- a/includes/captcha/engine_potpourri.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/captcha/engine_potpourri.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/clientside/jscompress.php
--- a/includes/clientside/jscompress.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/clientside/jscompress.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * jsres.php - the Enano client-side runtime, a.k.a. AJAX on steroids
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/clientside/jsres.php
--- a/includes/clientside/jsres.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/clientside/jsres.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * jsres.php - the Enano client-side runtime, a.k.a. AJAX on steroids
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/clientside/tinymce/tiny_mce_gzip.php
--- a/includes/clientside/tinymce/tiny_mce_gzip.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/clientside/tinymce/tiny_mce_gzip.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * tiny_mce_gzip.php - TinyMCE gzip and caching script, stock from MoxieCode with one modification
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/comment.php
--- a/includes/comment.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/comment.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/common.php
--- a/includes/common.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/common.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@
 // be the expected output of enano_version(), which will always be in the
 // format of 1.0.2, 1.0.2a1, 1.0.2b1, 1.0.2RC1
 // You'll want to change this for custom distributions.
-$version = '1.1.4';
+$version = '1.1.5';
 
 /**
  * Returns a floating-point number with the current UNIX timestamp in microseconds. Defined very early because we gotta call it
@@ -260,7 +260,7 @@
 // Now that we have the config, check the Enano version.
 if ( enano_version(false, true) != $version && !defined('IN_ENANO_UPGRADE') )
 {
-  grinding_halt('Version mismatch', '<p>It seems that the Enano release we\'re trying to run ('.$version.') is different from the version specified in your database ('.enano_version().'). Perhaps you need to <a href="'.scriptPath.'/install/upgrade.php">upgrade</a>?</p>');
+  grinding_halt('Version mismatch', '<p>It seems that the Enano release we\'re trying to run ('.$version.') is different from the version specified in your database ('.enano_version().'). Perhaps you need to <a href="'.scriptPath.'/install/index.php">upgrade</a>?</p>');
 }
 
 // Set our CDN path
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/common_cli.php
--- a/includes/common_cli.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/common_cli.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/constants.php
--- a/includes/constants.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/constants.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * constants.php - important defines used Enano-wide
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/dbal.php
--- a/includes/dbal.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/dbal.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/diff.php
--- a/includes/diff.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/diff.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/diffiehellman.php
--- a/includes/diffiehellman.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/diffiehellman.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * diffiehellman.php - Diffie Hellman key exchange and supporting functions
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/email.php
--- a/includes/email.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/email.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/functions.php
--- a/includes/functions.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/functions.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
@@ -1371,6 +1371,7 @@
 /**
  * Tell which version of Enano we're running.
  * @param bool $long if true, uses English version names (e.g. alpha, beta, release candidate). If false (default) uses abbreviations (1.0a1, 1.0b3, 1.0RC2, etc.)
+ * @param bool If true, prevents nightly build information from being appended, useful for upgrade/versioning checks.
  * @return string
  */
 
@@ -1413,6 +1414,7 @@
       '1.1.2'  => 'Caoineag alpha 2',
       '1.1.3'  => 'Caoineag alpha 3',
       '1.1.4'  => 'Caoineag alpha 4',
+      '1.1.5'  => 'Caoineag alpha 5',
     );
   $version = enano_version();
   if ( isset($names[$version]) )
@@ -2710,12 +2712,15 @@
     }
   }
   
+  if ( empty($page_id) )
+    return '';
+  
   // Remove character escapes
   $page_id = dirtify_page_id($page_id);
 
   $pid_clean = preg_replace('/[\w\.\/:;\(\)@\[\]_-]/', 'X', $page_id);
   $pid_dirty = enano_str_split($pid_clean, 1);
-
+  
   foreach ( $pid_dirty as $id => $char )
   {
     if ( $char == 'X' )
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/graphs.php
--- a/includes/graphs.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/graphs.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/http.php
--- a/includes/http.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/http.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * class_http.php - Pure PHP HTTP client library
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/js-compressor.php
--- a/includes/js-compressor.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/js-compressor.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Javascript compression library - used to compact the client-side Javascript code (all 72KB of it!) to save some bandwidth
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/lang.php
--- a/includes/lang.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/lang.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/math.php
--- a/includes/math.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/math.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * diffiehellman.php - Diffie Hellman key exchange and supporting functions
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/pageprocess.php
--- a/includes/pageprocess.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/pageprocess.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * pageprocess.php - intelligent retrieval of pages
  * Copyright (C) 2006-2008 Dan Fuhry
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/pageutils.php
--- a/includes/pageutils.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/pageutils.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/paths.php
--- a/includes/paths.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/paths.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /**
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * paths.php - The part of Enano that actually manages content. Everything related to page handling and namespaces is in here.
  *
@@ -192,7 +192,7 @@
     if ( defined('ENANO_INTERFACE_INDEX') || defined('ENANO_INTERFACE_AJAX') || defined('IN_ENANO_UPGRADE') )
     {
       $title = $this->parse_url(false);
-      if ( empty($title) )
+      if ( empty($title) && getConfig('main_page') != '' )
       {
         $this->main_page();
       }
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/plugins.php
--- a/includes/plugins.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/plugins.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/render.php
--- a/includes/render.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/render.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * render.php - handles fetching pages and parsing them into HTML
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/search.php
--- a/includes/search.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/search.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * search.php - algorithm used to search pages
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/sessions.php
--- a/includes/sessions.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/sessions.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * sessions.php - everything related to security and user management
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/sql_parse.php
--- a/includes/sql_parse.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/sql_parse.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * sql_parse.php - SQL query splitter and templater
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/stats.php
--- a/includes/stats.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/stats.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * stats.php - handles statistics for pages (disablable in the admin CP)
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/tagcloud.php
--- a/includes/tagcloud.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/tagcloud.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/template.php
--- a/includes/template.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/template.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
@@ -2498,8 +2498,8 @@
     $this->toolbar_menu = '';
     $this->additional_headers = '<style type="text/css">div.pagenav { border-top: 1px solid #CCC; padding-top: 7px; margin-top: 10px; }</style>';
     
-    $this->fading_button = '<div style="background-image: url('.cdnPath.'/images/about-powered-enano-hover.png); background-repeat: no-repeat; width: 88px; height: 31px; margin: 0 auto 5px auto;">
-                              <a href="http://enanocms.org/" onclick="window.open(this.href); return false;"><img style="border-width: 0;" alt=" " src="'.cdnPath.'/images/about-powered-enano.png" onmouseover="domOpacity(this, 100, 0, 500);" onmouseout="domOpacity(this, 0, 100, 500);" /></a>
+    $this->fading_button = '<div style="background-image: url('.scriptPath.'/images/about-powered-enano-hover.png); background-repeat: no-repeat; width: 88px; height: 31px; margin: 0 auto 5px auto;">
+                              <a href="http://enanocms.org/" onclick="window.open(this.href); return false;"><img style="border-width: 0;" alt=" " src="'.scriptPath.'/images/about-powered-enano.png" onmouseover="domOpacity(this, 100, 0, 500);" onmouseout="domOpacity(this, 0, 100, 500);" /></a>
                             </div>';
     
     // get list of themes
@@ -2622,7 +2622,7 @@
     {
       $js_dynamic .= '<script type="text/javascript" src="install.php?mode=langjs"></script>';
     }
-    $js_dynamic .= '<script type="text/javascript">var title="'. $title .'"; var scriptPath="'.scriptPath.'"; var ENANO_SID=""; var AES_BITS='.AES_BITS.'; var AES_BLOCKSIZE=' . AES_BLOCKSIZE . '; var pagepass=\'\'; var ENANO_LANG_ID = 1;</script>';
+    $js_dynamic .= '<script type="text/javascript">var title="'. $title .'"; var scriptPath="'.scriptPath.'"; var cdnPath="'.scriptPath.'"; var ENANO_SID=""; var AES_BITS='.AES_BITS.'; var AES_BLOCKSIZE=' . AES_BLOCKSIZE . '; var pagepass=\'\'; var ENANO_LANG_ID = 1;</script>';
     
     global $site_name, $site_desc;
     $site_default_name = ( !empty($site_name) ) ? $site_name : 'Critical error';
diff -r 15dbbe7e7674 -r 17ebe24cdf85 includes/wikiengine/Tables.php
--- a/includes/wikiengine/Tables.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/wikiengine/Tables.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 includes/wikiformat.php
--- a/includes/wikiformat.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/includes/wikiformat.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 index.php
--- a/index.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/index.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 install/includes/common.php
--- a/install/includes/common.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/common.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * common.php - Installer common functions
@@ -16,7 +16,7 @@
 
 // Our version number. This needs to be changed for any custom releases.
 $installer_version = array(
-  'version' => '1.1.4',
+  'version' => '1.1.5',
   'type' => 'alpha'
   // If type is set to "rc", "beta", or "alpha", optionally another version number can be issued with the key 'sub':
   // 'sub' => '3' will produce Enano 1.1.1a3 / Enano 1.1.1 alpha 3
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/libenanoinstall.php
--- a/install/includes/libenanoinstall.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/libenanoinstall.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * libenanoinstall.php - Installation payload backend
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/payload.php
--- a/install/includes/payload.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/payload.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * payload.php - Installer payload (the installation logic)
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/confirm.php
--- a/install/includes/stages/confirm.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/confirm.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * confirm.php - Installer installation summary/confirmation stage
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/database.php
--- a/install/includes/stages/database.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/database.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * database.php - Installer database driver selection stage
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/database_mysql.php
--- a/install/includes/stages/database_mysql.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/database_mysql.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * database_mysql.php - Installer database info page, MySQL
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/database_post.php
--- a/install/includes/stages/database_post.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/database_post.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * database_post.php - Database installation, stage 1
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/database_postgresql.php
--- a/install/includes/stages/database_postgresql.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/database_postgresql.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * database_postgresql.php - Installer database info page, PostgreSQL
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/finish.php
--- a/install/includes/stages/finish.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/finish.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * finish.php - Installer finalization stage
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/install.php
--- a/install/includes/stages/install.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/install.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * install.php - Installer payload stage
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/license.php
--- a/install/includes/stages/license.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/license.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * license.php - Installer license-agreement stage
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/login.php
--- a/install/includes/stages/login.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/login.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * login.php - Installer login information stage
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/sysreqs.php
--- a/install/includes/stages/sysreqs.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/sysreqs.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * sysreqs.php - Installer system-requirements page
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/stages/website.php
--- a/install/includes/stages/website.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/stages/website.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * website.php - Installer website-settings stage
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/includes/ui.php
--- a/install/includes/ui.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/includes/ui.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * ui.php - User interface for installations and upgrades
@@ -167,6 +167,7 @@
     $js_dynamic = '<script type="text/javascript">
         var title="' . $title . '";
         var scriptPath="'.scriptPath.'";
+        var cdnPath="'.scriptPath.'";
         var ENANO_SID="";
         var AES_BITS='.AES_BITS.';
         var AES_BLOCKSIZE=' . AES_BLOCKSIZE . ';
@@ -226,9 +227,11 @@
   
   function show_footer()
   {
+    $scriptpath = scriptPath;
     echo <<<EOF
           <div id="copyright">
             Enano and its various components, related documentation, and artwork are copyright &copy; 2006-2008 Dan Fuhry.<br />
+            Copyrights for <a href="{$scriptpath}/licenses/">third-party components</a> are held by their respective authors.<br />
             This program is Free Software; see the file "GPL" included with this package for details.
           </div>
         </div> <!-- div#enano-body -->
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/index.php
--- a/install/index.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/index.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * welcome.php - Portal to upgrade, readme, and install pages
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/install.php
--- a/install/install.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/install.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * install.php - Main installation interface
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/readme.php
--- a/install/readme.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/readme.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * install.php - Main installation interface
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/schemas/mysql_stage2.sql
--- a/install/schemas/mysql_stage2.sql	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/schemas/mysql_stage2.sql	Mon Aug 11 22:31:04 2008 -0400
@@ -76,7 +76,8 @@
   user_id mediumint(8),
   auth_level tinyint(1) NOT NULL DEFAULT '0',
   source_ip varchar(39) NOT NULL DEFAULT '127.0.0.1',
-  time bigint(15) default '0'
+  time bigint(15) default '0',
+  key_type tinyint(3) NOT NULL DEFAULT 0
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 CREATE TABLE {{TABLE_PREFIX}}themes(
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/schemas/postgresql_stage2.sql
--- a/install/schemas/postgresql_stage2.sql	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/schemas/postgresql_stage2.sql	Mon Aug 11 22:31:04 2008 -0400
@@ -75,7 +75,8 @@
   user_id int,
   auth_level smallint NOT NULL DEFAULT '0',
   source_ip varchar(39) NOT NULL DEFAULT '127.0.0.1',
-  time bigint DEFAULT '0'
+  time bigint DEFAULT '0',
+  key_type smallint NOT NULL DEFAULT 0
 );
 
 CREATE TABLE {{TABLE_PREFIX}}themes(
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/schemas/upgrade/1.1.4-1.1.5-mysql.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/install/schemas/upgrade/1.1.4-1.1.5-mysql.sql	Mon Aug 11 22:31:04 2008 -0400
@@ -0,0 +1,2 @@
+ALTER TABLE {{TABLE_PREFIX}}session_keys ADD COLUMN key_type tinyint(1) NOT NULL DEFAULT 0;
+
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/schemas/upgrade/1.1.4-1.1.5-postgresql.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/install/schemas/upgrade/1.1.4-1.1.5-postgresql.sql	Mon Aug 11 22:31:04 2008 -0400
@@ -0,0 +1,2 @@
+ALTER TABLE {{TABLE_PREFIX}}session_keys ADD COLUMN key_type smallint NOT NULL DEFAULT 0;
+
diff -r 15dbbe7e7674 -r 17ebe24cdf85 install/upgrade.php
--- a/install/upgrade.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/install/upgrade.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * upgrade.php - Upgrade interface
@@ -19,7 +19,7 @@
 // The list of versions in THIS AND PREVIOUS branches, in chronological order.
 $enano_versions = array();
 $enano_versions['1.0'] = array('1.0', '1.0.1', '1.0.2b1', '1.0.2', '1.0.3', '1.0.4');
-$enano_versions['1.1'] = array('1.1.1', '1.1.2', '1.1.3', '1.1.4');
+$enano_versions['1.1'] = array('1.1.1', '1.1.2', '1.1.3', '1.1.4', '1.1.5');
 
 // Turn on every imaginable API hack to make common load on older databases
 define('IN_ENANO_UPGRADE', 1);
diff -r 15dbbe7e7674 -r 17ebe24cdf85 licenses/index.html
--- a/licenses/index.html	Mon Aug 11 21:43:04 2008 -0400
+++ b/licenses/index.html	Mon Aug 11 22:31:04 2008 -0400
@@ -86,6 +86,7 @@
   <li>The <a href="http://www.jracademy.com/~jtucek/">e-mail address encryption</a> routine was originally written by Jim Tucek, and ported to PHP by Dan Fuhry. Jim allowed the code to be released under the GPL specifically for Enano.</li>
   <li><a href="http://www.softcomplex.com/products/tigra_tree_menu/">Tigra Tree Menu</a> - a modified version that remembers the state of the tree. The license terms are stated <a href="http://www.softcomplex.com/products/tigra_tree_menu/docs/#terms_cond">here</a>. After <a href="tigra-menu.html">contacting the author</a>, I was given permission to use the Tigra Tree Menu code as if it were under the GNU GPL. Therefore, you may use this code unde the terms of the GPL, however if you're making commercial use of it, the Softcomplex guys would appreciate if (but not require that) you would contact them first.</li>
   <li><a href="http://youngpup.net/projects/dom-drag/">youngpup</a>'s DOM-Drag class - the unmodified version is <a href="http://youngpup.net/projects/dom-drag/license.txt">in the public domain</a>; we chose to relicense it as of Enano 1.0.4 to clear up any potential legal complications</li>
+  <li>The <a href="http://www.puremango.co.uk/">freeCap</a> engine, used for generating CAPTCHA images.</li>
 </ul>
 
 <h2>GNU Lesser General Public License</h2>
diff -r 15dbbe7e7674 -r 17ebe24cdf85 plugins/PrivateMessages.php
--- a/plugins/PrivateMessages.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/PrivateMessages.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_privatemessages_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialAdmin.php
--- a/plugins/SpecialAdmin.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialAdmin.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialadmin_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialCSS.php
--- a/plugins/SpecialCSS.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialCSS.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialcss_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialGroups.php
--- a/plugins/SpecialGroups.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialGroups.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialgroups_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialPageFuncs.php
--- a/plugins/SpecialPageFuncs.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialPageFuncs.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialpagefuncs_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialRecentChanges.php
--- a/plugins/SpecialRecentChanges.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialRecentChanges.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialrecentchanges_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialSearch.php
--- a/plugins/SpecialSearch.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialSearch.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialsearch_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialUpdownload.php
--- a/plugins/SpecialUpdownload.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialUpdownload.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialupdownload_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  * SpecialUpdownload.php - handles uploading and downloading of user-uploaded files - possibly the most rigorously security-enforcing script in all of Enano, although sessions.php comes in a close second
  *
diff -r 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialUserFuncs.php
--- a/plugins/SpecialUserFuncs.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialUserFuncs.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialuserfuncs_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/SpecialUserPrefs.php
--- a/plugins/SpecialUserPrefs.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/SpecialUserPrefs.php	Mon Aug 11 22:31:04 2008 -0400
@@ -5,14 +5,14 @@
   "Plugin URI"   : "http://enanocms.org/",
   "Description"  : "plugin_specialuserprefs_desc",
   "Author"       : "Dan Fuhry",
-  "Version"      : "1.1.4",
+  "Version"      : "1.1.5",
   "Author URI"   : "http://enanocms.org/"
 }
 **!*/
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute it and/or modify it under the terms of the GNU General Public License
diff -r 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/CacheManager.php
--- a/plugins/admin/CacheManager.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/CacheManager.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/GroupManager.php
--- a/plugins/admin/GroupManager.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/GroupManager.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/LangManager.php
--- a/plugins/admin/LangManager.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/LangManager.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/PageEditor.php
--- a/plugins/admin/PageEditor.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/PageEditor.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/PageGroups.php
--- a/plugins/admin/PageGroups.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/PageGroups.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/PageManager.php
--- a/plugins/admin/PageManager.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/PageManager.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/PluginManager.php
--- a/plugins/admin/PluginManager.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/PluginManager.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/SecurityLog.php
--- a/plugins/admin/SecurityLog.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/SecurityLog.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/ThemeManager.php
--- a/plugins/admin/ThemeManager.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/ThemeManager.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/UserManager.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 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 15dbbe7e7674 -r 17ebe24cdf85 plugins/admin/UserRanks.php
--- a/plugins/admin/UserRanks.php	Mon Aug 11 21:43:04 2008 -0400
+++ b/plugins/admin/UserRanks.php	Mon Aug 11 22:31:04 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.4 (Caoineag alpha 4)
+ * Version 1.1.5 (Caoineag alpha 5)
  * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License