# HG changeset patch
# User Dan
# Date 1190692771 14400
# Node ID 6f0bbf88c3251ca597cb76ac8b59a1ee61d6dd3d
# Parent  380e55865f86bb43530e25796317ba1f93b095a4
Rebrand for 1.0.2b1

diff -r 380e55865f86 -r 6f0bbf88c325 includes/common.php
--- a/includes/common.php	Mon Sep 24 21:29:19 2007 -0400
+++ b/includes/common.php	Mon Sep 24 23:59:31 2007 -0400
@@ -23,7 +23,7 @@
   exit;
 }
 
-$version = '1.0.2';
+$version = '1.0.2b1';
 
 function microtime_float()
 {
diff -r 380e55865f86 -r 6f0bbf88c325 includes/functions.php
--- a/includes/functions.php	Mon Sep 24 21:29:19 2007 -0400
+++ b/includes/functions.php	Mon Sep 24 23:59:31 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();
diff -r 380e55865f86 -r 6f0bbf88c325 install.php
--- a/install.php	Mon Sep 24 21:29:19 2007 -0400
+++ b/install.php	Mon Sep 24 23:59:31 2007 -0400
@@ -23,8 +23,9 @@
 
 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
+define('ENANO_BETA_VERSION', '1');
 
 if(!defined('scriptPath')) {
   $sp = dirname($_SERVER['REQUEST_URI']);
@@ -260,7 +261,7 @@
 }
 
 $template = new template_nodb();
-$template->load_theme('oxygen', 'bleu', false);
+$template->load_theme('stpatty', 'shamrock', false);
 
 $modestrings = Array(
               'welcome' => 'Welcome',
@@ -313,10 +314,10 @@
   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.1.1 &ndash; stable<br />
-      <span style="font-weight: normal;">also affectionately known as "loch ness" <tt>:)</tt></span></h3>
+      <h3>version 1.0.2 &ndash; beta 1<br />
+      <span style="font-weight: normal;">also affectionately known as "coblynau" <tt>:)</tt></span></h3>
       <?php
       if ( file_exists('./_nightly.php') )
       {
@@ -1065,8 +1066,7 @@
       $schema = str_replace('{{TABLE_PREFIX}}', $_POST['table_prefix'],                          $schema);
       $schema = str_replace('{{VERSION}}',      ENANO_VERSION,                                   $schema);
       $schema = str_replace('{{ADMIN_EMBED_PHP}}', $_POST['admin_embed_php'],                    $schema);
-      // Not anymore!! :-D
-      // $schema = str_replace('{{BETA_VERSION}}', ENANO_BETA_VERSION,                              $schema);
+      $schema = str_replace('{{BETA_VERSION}}', ENANO_BETA_VERSION,                              $schema);
       
       if(isset($_POST['wiki_mode']))
       {
diff -r 380e55865f86 -r 6f0bbf88c325 plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Mon Sep 24 21:29:19 2007 -0400
+++ b/plugins/admin/UserManager.php	Mon Sep 24 23:59:31 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();
     
diff -r 380e55865f86 -r 6f0bbf88c325 schema.sql
--- a/schema.sql	Mon Sep 24 21:29:19 2007 -0400
+++ b/schema.sql	Mon Sep 24 23:59:31 2007 -0400
@@ -278,7 +278,7 @@
   ('copyright_notice', '{{COPYRIGHT}}'),
   ('wiki_edit_notice_text', '== Why can I edit this page? ==\n\nEveryone can edit almost any page in this website. This concept is called a wiki. It gives everyone the opportunity to make a change for the best. While some spam and vandalism may occur, it is believed that most contributions will be legitimate and helpful.\n\nFor security purposes, a history of all page edits is kept, and administrators are able to restore vandalized or spammed pages with just a few clicks.'),
   ('cache_thumbs', '{{ENABLE_CACHE}}'),
-  ('max_file_size', '256000'),('enano_version', '{{VERSION}}'),( 'allowed_mime_types', 'cbf:len=168;crc=c3dcad3f;data=0[1],1[4],0[3],1[1],0[2],1[1],0[11],1[1],0[7],1[1],0[9],1[1],0[6],1[3],0[10],1[1],0[2],1[2],0[1],1[1],0[1],1[2],0[6],1[3],0[1],1[1],0[2],1[4],0[1],1[2],0[3],1[1],0[4],1[2],0[26],1[5],0[6],1[2],0[2],1[1],0[4],1[1],0[10],1[2],0[1],1[1],0[6]|end' ),
+  ('max_file_size', '256000'),('enano_version', '{{VERSION}}'),('enano_beta_version', '{{BETA_VERSION}}'),( 'allowed_mime_types', 'cbf:len=168;crc=c3dcad3f;data=0[1],1[4],0[3],1[1],0[2],1[1],0[11],1[1],0[7],1[1],0[9],1[1],0[6],1[3],0[10],1[1],0[2],1[2],0[1],1[1],0[1],1[2],0[6],1[3],0[1],1[1],0[2],1[4],0[1],1[2],0[3],1[1],0[4],1[2],0[26],1[5],0[6],1[2],0[2],1[1],0[4],1[1],0[10],1[2],0[1],1[1],0[6]|end' ),
   ('contact_email', '{{ADMIN_EMAIL}}'),
   ('powered_btn', '1');
 
diff -r 380e55865f86 -r 6f0bbf88c325 upgrade.php
--- a/upgrade.php	Mon Sep 24 21:29:19 2007 -0400
+++ b/upgrade.php	Mon Sep 24 23:59:31 2007 -0400
@@ -77,7 +77,7 @@
     '1.0' => Array('1.0.1'),
     '1.0.1' => Array('1.0.1.1')
   );
-$this_version   = '1.0.2';
+$this_version   = '1.0.2b1';
 $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'), // ,
@@ -157,7 +157,7 @@
 $session->start();
 
 $template = new template_nodb();
-$template->load_theme('oxygen', 'bleu', false);
+$template->load_theme('stpatty', 'shamrock', false);
 
 $modestrings = Array(
               'login'      => 'Administrative login',
@@ -525,7 +525,7 @@
     ?>
     
     <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: 134px;" />
+      <img alt="[ Enano CMS Project logo ]" src="images/enano-artwork/installer-greeting-green.png" style="display: block; margin: 0 auto; padding-left: 134px;" />
       <h2>Welcome to the Enano upgrade wizard</h2>
       <?php
       if ( file_exists('./_nightly.php') )
diff -r 380e55865f86 -r 6f0bbf88c325 upgrade.sql
--- a/upgrade.sql	Mon Sep 24 21:29:19 2007 -0400
+++ b/upgrade.sql	Mon Sep 24 23:59:31 2007 -0400
@@ -3,7 +3,7 @@
 -- 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.0.2' ),( 'enano_beta_version', '1' );
 ---BEGIN 1.0.1.1---
 -- No changes in this release
 ---END 1.0.1.1---