merging 5.5.6. changes

docs/changelog/5.x.x.txt

@@ -1,3 +1,22 @@
+5.5.6
+ - bugfix [ 895067 ] Forum ID Missing In USS
+ - bugfix [ 909688 ] USS forum post edit function not work
+ - bugfix [ 910514 ] Article Discussion - Not reporting correctly
+ - Bugfix [ 917535 ] 5.5.5 HTMLEdit - Insert Image Not Functional
+ - bugfix [ 912404 ] Visitors can turn admin on
+ - bugfix [ 917913, 915019, 913999, 912765, 912206 ] OwnerId was not set correctly
+   when saving page.
+ - Bugfix [ 884375 ] Fix for multiple forum posts applied also to
+   www_viewForum to handle postings that start a new thread.
+ - Bugfix [ 909579 ] possible package problem 5.5.4
+ - Bugfix [ 918136 ] upgrade to 5.5.5 sql inserts wrong version number
+ - Bugfix [ 917338 ] Typo in 5.5.5 Email Data Form
+ - Bugfix [ 932243 ] Security bug: Env Host can be spoofed
+ - Bugfix [ 913525 ] Beg. / End Dates of WObjects
+ - Bugfix [ 927530 ] bugfix FormProcessor email checking change
+
+
+
 5.5.5
  - Fixed a bug in AdminBar's clipboard code where a standard hash was
    used instead of a CPHash for database access.  (Thanks to Steve Simms.)

docs/gotcha.txt

@@ -8,6 +8,12 @@ versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
 
+6.0.2
+--------------------------------------------------------------------
+ * You need to add all of your site aliases to the sitename variable
+        in your WebGUI config file.
+
+
 6.0.1
 --------------------------------------------------------------------
  * Apache 2.0 is now the recommended web server for WebGUI. As such

docs/upgrades/upgrade_5.5.4-5.5.5.sql

@@ -1,4 +1,4 @@
-insert into webguiVersion values ('5.5.4','upgrade',unix_timestamp());
+insert into webguiVersion values ('5.5.5','upgrade',unix_timestamp());
 
 
 delete from international where internationalId=416 and namespace='WebGUI';