Putting 4.2.0 on top of 4.0.17
[usit-rt.git] / share / html / Ticket / Elements / AddWatchers
index 8e11ba2..8e41b09 100644 (file)
@@ -84,7 +84,7 @@
 <tr><td>
 <&/Elements/SelectWatcherType, Name => "WatcherTypeEmail".$counter &>
 </td><td>
-<input type="hidden" name="WatcherAddressEmail<%$counter%>" value="<%$email->address%>">
+<input type="hidden" name="WatcherAddressEmail<%$counter%>" value="<%$email->format%>">
 <%$email->format%>
 </td></tr>
 % }
@@ -116,7 +116,7 @@ if ($UserString) {
 
 if ($GroupString) {
     $Groups = RT::Groups->new($session{'CurrentUser'});
-    $Groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined');
+    $Groups->LimitToUserDefinedGroups;
     $Groups->Limit(FIELD => $GroupField, VALUE => $GroupString, OPERATOR => $GroupOp);
      }