# HG changeset patch
# User Dan
# Date 1189274655 14400
# Node ID cfa4ae0830cff15f6c52920fa63ebf219e490fff
# Parent  fb31c951d3a27a989e2268063ade347e0a11e995# Parent  cbbc0d39ca9407855e2502357491069f1e8c7310
Merging Nighthawk and Scribus repositories

diff -r fb31c951d3a2 -r cfa4ae0830cf .hgtags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Sat Sep 08 14:04:15 2007 -0400
@@ -0,0 +1,3 @@
+0d3a6e93788696278300db61266ae78aeec367c1 release
+1eb7b2b4bdbc27a6ec30d4dc7b6d2d72a5f537aa release
+8df3abef66473fef1a8ecbbd60a4e94e4f466ec4 release
diff -r fb31c951d3a2 -r cfa4ae0830cf README
--- a/README	Sat Sep 08 14:02:19 2007 -0400
+++ b/README	Sat Sep 08 14:04:15 2007 -0400
@@ -1,5 +1,5 @@
 Enano CMS
-Version 1.0
+Version 1.0.1
 -----------------------------
 
 Thanks for downloading Enano! If you're looking for an installation guide,
@@ -19,7 +19,7 @@
 CHANGES IN THIS RELEASE
 -----------------------------
 
-Please see <http://enanocms.org/Release_notes/1.0> for a list of changes in
+Please see <http://enanocms.org/Release_notes/1.0.1> for a list of changes in
 this release.
 
 UPGRADING FROM PREVIOUS RELEASES
@@ -29,7 +29,7 @@
 of Enano to this one. Before you upload the contents of this tarball to your
 server, be sure to delete the config.php and .htaccess files included with this
 tarball, and back up these two files from your server. (.htaccess only needs to
-be backed up if you're using the Tiny URLs option.)
+be backed up if you're using the Tiny URLs option and/or you have Apache.)
 
 EXPANDING YOUR SITE'S CAPABILITIES
 -----------------------------
@@ -57,3 +57,8 @@
 Have fun with Enano!
 
 - The Enano team
+  Dan Fuhry     <dan@enanocms.org>
+  Neal Gompa    <neal@enanocms.org>
+  Manoj Maddali <manoj@enanocms.org>
+  ThGeneral8    <the.true.general@googlemail.com>
+
diff -r fb31c951d3a2 -r cfa4ae0830cf plugins/SpecialUserFuncs.php
diff -r fb31c951d3a2 -r cfa4ae0830cf schema.sql
--- a/schema.sql	Sat Sep 08 14:02:19 2007 -0400
+++ b/schema.sql	Sat Sep 08 14:04:15 2007 -0400
@@ -312,6 +312,6 @@
   (1, 1, 1, 'Navigation', 1, '[[Main Page|Home]]'),
   (2, 2, 1, 'Tools', 1, '[[$NS_SPECIAL$CreatePage|Create a page]]\n[[$NS_SPECIAL$UploadFile|Upload file]]\n[[$NS_SPECIAL$SpecialPages|Special pages]]\n{if auth_admin}\n[[$NS_SPECIAL$EditSidebar|Edit the sidebar]]\n$ADMIN_LINK$\n{/if}'),
   (3, 3, 1, '$USERNAME$', 1, '[[$NS_USER$$USERNAME$|User page]]\n[[$NS_SPECIAL$Contributions/$USERNAME$|My Contributions]]\n{if user_logged_in}\n[[$NS_SPECIAL$Preferences|Preferences]]\n[[$NS_SPECIAL$PrivateMessages|Private messages]]\n[[$NS_SPECIAL$Usergroups|Group control panel]]\n$THEME_LINK$\n{/if}\n{if user_logged_in}\n$LOGOUT_LINK$\n{else}\n[[$NS_SPECIAL$Register|Create an account]]\n$LOGIN_LINK$\n[[$NS_SPECIAL$Login/$NS_SPECIAL$PrivateMessages|Private messages]]\n{/if}'),
-  (4, 4, 1, 'Search', 1, '<div class="slideblock2" style="padding: 0px;"><form action="$SCRIPTPATH$/$NS_SPECIAL$Search" method="get" style="padding: 0; margin: 0;"><p><input name="q" alt="Search box" type="text" size="10" style="width: 70%" /> <input type="submit" value="Go" style="width: 20%" /></p></form></div>'),
+  (4, 4, 1, 'Search', 1, '<div class="slideblock2" style="padding: 0px;"><form action="$CONTENTPATH$$NS_SPECIAL$Search" method="get" style="padding: 0; margin: 0;"><p><input type="hidden" name="title" value="$NS_SPECIAL$Search" />$INPUT_AUTH$<input name="q" alt="Search box" type="text" size="10" style="width: 70%" /> <input type="submit" value="Go" style="width: 20%" /></p></form></div>'),
   (5, 2, 2, 'Links', 4, 'Links');
 
diff -r fb31c951d3a2 -r cfa4ae0830cf upgrade.sql
--- a/upgrade.sql	Sat Sep 08 14:02:19 2007 -0400
+++ b/upgrade.sql	Sat Sep 08 14:04:15 2007 -0400
@@ -6,7 +6,7 @@
 INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0.1' );
 ---BEGIN 1.0---
 -- Fix for obnoxious $_GET issue
-UPDATE {{TABLE_PREFIX}}sidebar SET block_content='<div class="slideblock2" style="padding: 0px;"><form action="$CONTENTPATH$$NS_SPECIAL$Search" method="get" style="padding: 0; margin: 0;"><p><input type="hidden" name="title" value="$NS_SPECIAL$Search" />$INPUT_AUTH$<input name="q" alt="Search box" type="text" size="10" style="width: 70%" /> <input type="submit" value="Go" style="width: 20%" /></p></form></div>' WHERE block_name='Search' AND item_id=4;
+UPDATE {{TABLE_PREFIX}}sidebar SET block_type=1,block_content='<div class="slideblock2" style="padding: 0px;"><form action="$CONTENTPATH$$NS_SPECIAL$Search" method="get" style="padding: 0; margin: 0;"><p><input type="hidden" name="title" value="$NS_SPECIAL$Search" />$INPUT_AUTH$<input name="q" alt="Search box" type="text" size="10" style="width: 70%" /> <input type="submit" value="Go" style="width: 20%" /></p></form></div>' WHERE block_name='Search' AND item_id=4;
 -- Added on advice from Neal
 INSERT INTO {{TABLE_PREFIX}}acl(target_type,target_id,page_id,namespace,rules) VALUES(2,1,'Memberlist','Special','read=1;mod_misc=1;upload_files=1;upload_new_version=1;create_page=1;edit_acl=1;');
 -- Bugfix for MySQL 5.0.45, see http://forum.enanocms.org/viewtopic.php?f=5&t=8