--- a/.hgtags Mon Sep 24 21:29:19 2007 -0400
+++ b/.hgtags Sun Sep 30 19:16:24 2007 -0400
@@ -2,3 +2,5 @@
1eb7b2b4bdbc27a6ec30d4dc7b6d2d72a5f537aa release
8df3abef66473fef1a8ecbbd60a4e94e4f466ec4 release
ca9118d9c0f2be22407860f41523f47b2862b34a rebrand
+6f0bbf88c3251ca597cb76ac8b59a1ee61d6dd3d rebrand
+0b5244001799fa29e83bf06c5f14eb69350f171c rebrand
--- a/includes/functions.php Mon Sep 24 21:29:19 2007 -0400
+++ b/includes/functions.php Sun Sep 30 19:16:24 2007 -0400
@@ -1207,6 +1207,7 @@
'1.0' => 'Banshee',
'1.0.1' => 'Loch Ness',
'1.0.1.1'=> 'Loch Ness internal bugfix build',
+ '1.0.2b1'=> 'Coblynau unstable',
'1.0.2' => 'Coblynau'
);
$version = enano_version();
--- a/install.php Mon Sep 24 21:29:19 2007 -0400
+++ b/install.php Sun Sep 30 19:16:24 2007 -0400
@@ -15,7 +15,7 @@
@include('config.php');
if( ( defined('ENANO_INSTALLED') || defined('MIDGET_INSTALLED') ) && ((isset($_GET['mode']) && ($_GET['mode']!='finish' && $_GET['mode']!='css')) || !isset($_GET['mode']))) {
- $_GET['title'] = 'Enano:WhoCaresWhatThisIs';
+ $_GET['title'] = 'Enano:Installation_locked';
require('includes/common.php');
die_friendly('Installation locked', '<p>The Enano installer has found a Enano installation in this directory. You MUST delete config.php if you want to re-install Enano.</p><p>If you wish to upgrade an older Enano installation to this version, please use the <a href="upgrade.php">upgrade script</a>.</p>');
exit;
@@ -23,7 +23,7 @@
define('IN_ENANO_INSTALL', 'true');
-define('ENANO_VERSION', '1.0.1.1');
+define('ENANO_VERSION', '1.0.2');
// In beta versions, define ENANO_BETA_VERSION here
if(!defined('scriptPath')) {
@@ -315,8 +315,8 @@
<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;" />
<h2>Welcome to Enano</h2>
- <h3>version 1.0.1.1 – stable<br />
- <span style="font-weight: normal;">also affectionately known as "loch ness" <tt>:)</tt></span></h3>
+ <h3>version 1.0.2 – stable<br />
+ <span style="font-weight: normal;">also affectionately known as "coblynau" <tt>:)</tt></span></h3>
<?php
if ( file_exists('./_nightly.php') )
{
--- a/plugins/admin/UserManager.php Mon Sep 24 21:29:19 2007 -0400
+++ b/plugins/admin/UserManager.php Sun Sep 30 19:16:24 2007 -0400
@@ -286,7 +286,7 @@
$q = $db->sql_query('SELECT u.user_id AS authoritative_uid, u.username, u.email, u.real_name, u.signature, u.account_active, u.user_level, x.* FROM '.table_prefix.'users AS u
LEFT JOIN '.table_prefix.'users_extra AS x
ON ( u.user_id = x.user_id OR x.user_id IS NULL )
- WHERE ( lcase(u.username) = \'' . $db->escape(strtolower($username)) . '\' OR u.username = \'' . $db->escape($username) . '\' ) AND user_id != 1;');
+ WHERE ( lcase(u.username) = \'' . $db->escape(strtolower($username)) . '\' OR u.username = \'' . $db->escape($username) . '\' ) AND u.user_id != 1;');
if ( !$q )
$db->_die();
--- a/schema.sql Mon Sep 24 21:29:19 2007 -0400
+++ b/schema.sql Sun Sep 30 19:16:24 2007 -0400
@@ -1,5 +1,5 @@
-- Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
--- Version 1.0 (Banshee)
+-- Version 1.0.2 (Coblynau)
-- 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
--- a/upgrade.php Mon Sep 24 21:29:19 2007 -0400
+++ b/upgrade.php Sun Sep 30 19:16:24 2007 -0400
@@ -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');
+$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');
// 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
@@ -75,7 +75,8 @@
'1.0RC2' => Array('1.0RC3'),
'1.0RC3' => Array('1.0'),
'1.0' => Array('1.0.1'),
- '1.0.1' => Array('1.0.1.1')
+ '1.0.1' => Array('1.0.1.1'),
+ '1.0.1.1' => Array('1.0.2b1')
);
$this_version = '1.0.2';
$func_list = Array(
@@ -619,10 +620,10 @@
$schema = file_get_contents('upgrade.sql');
// Strip out and process version blocks
- preg_match_all('#---BEGIN ([0-9A-z\.\-]*?)---'."\n".'(.*?)'."\n".'---END \\1---#is', $schema, $matches);
+ preg_match_all('#---BEGIN ([0-9A-z\.\-]*?)---'."\n".'((.*?)'."\n)?".'---END \\1---#is', $schema, $matches);
$from_list =& $matches[1];
- $query_list =& $matches[2];
+ $query_list =& $matches[3];
foreach($matches[0] as $m)
{
--- a/upgrade.sql Mon Sep 24 21:29:19 2007 -0400
+++ b/upgrade.sql Sun Sep 30 19:16:24 2007 -0400
@@ -4,11 +4,11 @@
-- 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' );
+---BEGIN 1.0.2b1---
+---END 1.0.2b1---
---BEGIN 1.0.1.1---
--- No changes in this release
---END 1.0.1.1---
---BEGIN 1.0.1---
--- No changes in this release
---END 1.0.1---
---BEGIN 1.0---
-- Fix for obnoxious $_GET issue