forward porting editBranch ownerUserId fixes into HEAD

docs/changelog/7.x.x.txt

@@ -32,6 +32,8 @@
     references (since JSON won't store them and they're of no use to us anyway).
  - fix: No current asset when ending up on Not Found page
  - fix: Couldn't add single photos to gallery.
+ - fix: Make the Owner in editBranch to be the same as addEdit, allowing
+   any user to be selected (perlDreamer Consulting, LLC.)
 
 7.5.0
  - rfe: Search Asset returns URLs

lib/WebGUI/AssetBranch.pm

@@ -169,30 +169,13 @@ sub www_editBranch {
 		-subtext=>'<br />'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_encryptPage"})
                 );
         }
-	my $subtext;
+        $tabform->getTab("security")->user(
-        if ($self->session->user->isInGroup(3)) {
-                 $subtext = $self->session->icon->manage('op=listUsers');
-        } else {
-                 $subtext = "";
-        }
-        my $clause;
-        if ($self->session->user->isInGroup(3)) {
-                my $contentManagers = WebGUI::Group->new($self->session,4)->getAllUsers();
-                push (@$contentManagers, $self->session->user->userId);
-                $clause = "userId in (".$self->session->db->quoteAndJoin($contentManagers).")";
-        } else {
-                $clause = "userId=".$self->session->db->quote($self->get("ownerUserId"));
-        }
-        my $users = $self->session->db->buildHashRef("select userId,username from users where $clause order by username");
-        $tabform->getTab("security")->selectBox(
                -name=>"ownerUserId",
-               -options=>$users,
                -label=>$i18n->get(108),
-		-hoverHelp=>$i18n->get('108 description',"Asset"),
+               -hoverHelp=>$i18n->get('108 description',"Asset"),
-               -value=>[$self->get("ownerUserId")],
+               -value=>$self->get("ownerUserId"),
-               -subtext=>$subtext,
                -uiLevel=>6,
-		-subtext=>'<br />'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_ownerUserId"})
+               -subtext=>'<br />'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_ownerUserId"})
                );
         $tabform->getTab("security")->group(
                -name=>"groupIdView",

t/Session/Var.t

@@ -64,8 +64,8 @@ $newEnvHash{REMOTE_ADDR} = '10.0.5.5';
 
 #Grab a more recent version of our user session object
 $varTime = time();
-$varExpires = $varTime + $session->setting->get('sessionTimeout');
 my $var2 = WebGUI::Session::Var->new($session, $session->getId);
+$varExpires = $varTime + $session->setting->get('sessionTimeout');
 
 cmp_deeply(
 	$var2,