[Rt-commit] r10475 - in rtfm/branches/2.3-EXPERIMENTAL: . html/Admin/RTFM/Classes

[falcone at bestpractical.com]

Author: falcone
Date: Thu Jan 24 14:26:06 2008
New Revision: 10475

Modified:
   rtfm/branches/2.3-EXPERIMENTAL/   (props changed)
   rtfm/branches/2.3-EXPERIMENTAL/META.yml
   rtfm/branches/2.3-EXPERIMENTAL/html/Admin/RTFM/Classes/Modify.html
   rtfm/branches/2.3-EXPERIMENTAL/sbin/migrate-2.0-to-2.1

Log:
merge 2.2 bugfixes

Modified: rtfm/branches/2.3-EXPERIMENTAL/META.yml
==============================================================================

Modified: rtfm/branches/2.3-EXPERIMENTAL/html/Admin/RTFM/Classes/Modify.html
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/html/Admin/RTFM/Classes/Modify.html	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/html/Admin/RTFM/Classes/Modify.html	Thu Jan 24 14:26:06 2008
@@ -43,7 +43,7 @@
 </tr>
 <tr>
 <td>&nbsp;</td>
-<td><input type="checkbox" name="HotList" value="1" <%$HotListChecked%>> <&|/l&>All articles in this topic are on dropdown on ticket reply page</&></td>
+<td><input type="checkbox" name="HotList" value="1" <%$HotListChecked%>> <&|/l&>All articles in this class are on dropdown on ticket reply page</&></td>
 </tr>
 </table>
 

Modified: rtfm/branches/2.3-EXPERIMENTAL/sbin/migrate-2.0-to-2.1
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/sbin/migrate-2.0-to-2.1	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/sbin/migrate-2.0-to-2.1	Thu Jan 24 14:26:06 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use RT;
 RT::LoadConfig;
@@ -6,6 +6,12 @@
 use RT::FM::CustomFieldCollection;
 use Data::Dumper;
 
+use strict;
+use warnings;
+
+my $cf_data;
+my @aces_to_delete;
+
 # find each rtfm custom field
 my $cfs = RT::FM::CustomFieldCollection->new($RT::SystemUser);
 $cfs->UnLimit();
@@ -223,7 +229,7 @@
 	ActivateScrips => 0
       );
 
-        print " $txn_msg\n";
+        print " $transmsg\n";
 }
 
 #