- fix [ 1288699 ] 6.7.4 - username sometimes does not appear

- fix [ 1296468 ] Username doesn't show up in Edit User Account
 - fix [ 1295921 ] Problem with Survey content.
 - fix [ 1290460 ] Survey error when adding multiple choice answers
 - fix [ 1288887 ] new user information mail dos'nt contains the username

docs/changelog/6.x.x.txt

@@ -17,7 +17,11 @@
  - fix [ 1241451 ] Images not showing up in TinyMCE
  - fix [ 1252786 ] rich edit ie image problem
  - fix [ 1284248 ] runHourly.pl moving assets I don't want in trash to trash
-
+ - fix [ 1288699 ] 6.7.4 - username sometimes does not appear
+ - fix [ 1296468 ] Username doesn't show up in Edit User Account
+ - fix [ 1295921 ] Problem with Survey content.
+ - fix [ 1290460 ] Survey error when adding multiple choice answers
+ - fix [ 1288887 ] new user information mail dos'nt contains the username
 
 6.7.4
  - fix [ 1279861 ] POD errors in 6.7.3

docs/upgrades/upgrade_6.7.4-6.7.5.pl

@@ -0,0 +1,45 @@
+use lib "../../lib";
+use strict;
+use Getopt::Long;
+use WebGUI::Session;
+use WebGUI::SQL;
+use WebGUI::Asset;
+use WebGUI::Setting;
+
+my $toVersion = "6.7.5";
+my $configFile;
+my $quiet;
+
+start();
+
+fixSurveyAnswerDefinition();
+
+finish();
+
+
+#-------------------------------------------------
+sub fixSurveyAnswerDefinition {
+        print "\tFixing definition of survey answers.\n" unless ($quiet);
+	WebGUI::SQL->write("alter table Survey_answer change gotoQuestion gotoQuestion varchar(22) binary");
+}
+
+
+
+
+#-------------------------------------------------
+sub start {
+	$|=1; #disable output buffering
+	GetOptions(
+    		'configFile=s'=>\$configFile,
+        	'quiet'=>\$quiet
+	);
+	WebGUI::Session::open("../..",$configFile);
+	WebGUI::Session::refreshUserInfo(3);
+	WebGUI::SQL->write("insert into webguiVersion values (".quote($toVersion).",'upgrade',".time().")");
+}
+
+#-------------------------------------------------
+sub finish {
+	WebGUI::Session::close();
+}
+

lib/WebGUI.pm

@@ -1,5 +1,5 @@
 package WebGUI;
-our $VERSION = "6.7.4";
+our $VERSION = "6.7.5";
 our $STATUS = "gamma";
 
 #-------------------------------------------------------------------

lib/WebGUI/User.pm

@@ -239,7 +239,7 @@ sub new {
         $userId = _create($overrideId) if ($userId eq "new");
 	my $cache = WebGUI::Cache->new(["user",$userId]);
 	my $userData = $cache->get;
-	unless ($userData->{_userId}) {
+	unless ($userData->{_userId} && $userData->{_user}{username}) {
 		my %user;
 		tie %user, 'Tie::CPHash';
 		%user = WebGUI::SQL->quickHash("select * from users where userId=".quote($userId));