Merge branch '4.2/empty-requestor-on-resubmit' into 4.2-trunk

bestpractical · Oct 22, 2014 · 31d5b4d · 31d5b4d
2 parents 6f87970 + 4eee9f0
commit 31d5b4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
@@ -129,7 +129,7 @@
 <&|/l&>Requestors</&>:
 </td>
 <td class="value" colspan="5">
-<& /Elements/EmailInput, Name => 'Requestors', Size => undef, Default => $ARGS{Requestors} || $session{CurrentUser}->EmailAddress, AutocompleteMultiple => 1 &>
+<& /Elements/EmailInput, Name => 'Requestors', Size => undef, Default => $ARGS{Requestors} // $session{CurrentUser}->EmailAddress, AutocompleteMultiple => 1 &>
 % $m->callback( CallbackName => 'AfterRequestors', QueueObj => $QueueObj, ARGSRef => \%ARGS );
 </td>
 </tr>

diff --git a/share/html/m/ticket/create b/share/html/m/ticket/create
@@ -269,7 +269,7 @@ $showrows->(
         "/Elements/EmailInput",
         Name    => 'Requestors',
         Size    => '40',
-        Default => $ARGS{Requestors} || $session{CurrentUser}->EmailAddress
+        Default => $ARGS{Requestors} // $session{CurrentUser}->EmailAddress
     ),
 
     loc("Cc") =>