From 2dcb24f9ebcb9a3b507f6178f7ec5c383682cef0 Mon Sep 17 00:00:00 2001
From: Emmanuel Lacour <elacour@easter-eggs.com>
Date: Mon, 4 Apr 2016 13:43:06 +0200
Subject: [PATCH] Fix drafts loading for RT 4.4.x

---
 html/Callbacks/Drafts/Ticket/Display.html/BeforeDisplay  | 2 +-
 html/Callbacks/Drafts/Ticket/Update.html/AfterMessageBox | 4 ++--
 html/Callbacks/Drafts/Ticket/Update.html/Initial         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/Callbacks/Drafts/Ticket/Display.html/BeforeDisplay b/html/Callbacks/Drafts/Ticket/Display.html/BeforeDisplay
index 243d848..f3638a5 100644
--- a/html/Callbacks/Drafts/Ticket/Display.html/BeforeDisplay
+++ b/html/Callbacks/Drafts/Ticket/Display.html/BeforeDisplay
@@ -4,7 +4,7 @@ if ($$ARGSRef{'id'} ne 'new'){
     my $Ticket = LoadTicket($$ARGSRef{'id'});
     if ( $$ARGSRef{'UpdateContent'} ) {
         my $Draft = RT::Attribute->new( $session{'CurrentUser'} );
-        $Draft->LoadByNameAndObject( Object => $session{'CurrentUser'}, Name => 'Draft-'.$Ticket->id );
+        $Draft->LoadByNameAndObject( Object => $session{'CurrentUser'}->UserObj, Name => 'Draft-'.$Ticket->id );
         $Draft->Delete if ( $Draft && $Draft->Id );
     }
 }
diff --git a/html/Callbacks/Drafts/Ticket/Update.html/AfterMessageBox b/html/Callbacks/Drafts/Ticket/Update.html/AfterMessageBox
index e92c773..2a92f3c 100644
--- a/html/Callbacks/Drafts/Ticket/Update.html/AfterMessageBox
+++ b/html/Callbacks/Drafts/Ticket/Update.html/AfterMessageBox
@@ -6,7 +6,7 @@
 my $Ticket = LoadTicket($ARGS{'id'});
 
 my $Draft = RT::Attribute->new( $session{'CurrentUser'} );
-$Draft->LoadByNameAndObject( Object => $session{'CurrentUser'}, Name => 'Draft-'.$Ticket->id );
+$Draft->LoadByNameAndObject( Object => $session{'CurrentUser'}->UserObj, Name => 'Draft-'.$Ticket->id );
 
 if ( $ARGS{'SaveDraft'} ) {
     if ( $Draft && $Draft->Id ) {
@@ -14,7 +14,7 @@ if ( $ARGS{'SaveDraft'} ) {
         $Draft->SetContentType( $ARGS{'UpdateContentType'} || 'text/plain' );
     } else {
         $Draft->Create( Name => 'Draft-'.$Ticket->id,
-            Object => $session{'CurrentUser'},
+            Object => $session{'CurrentUser'}->UserObj,
             Content => $ARGS{'UpdateContent'},
             ContentType => $ARGS{'UpdateContentType'} || 'text/plain',
         );
diff --git a/html/Callbacks/Drafts/Ticket/Update.html/Initial b/html/Callbacks/Drafts/Ticket/Update.html/Initial
index 85e3b88..093fca6 100644
--- a/html/Callbacks/Drafts/Ticket/Update.html/Initial
+++ b/html/Callbacks/Drafts/Ticket/Update.html/Initial
@@ -2,7 +2,7 @@
 my $Ticket = LoadTicket($$ARGSRef{'id'});
 if ( $$ARGSRef{'LoadDraft'} ) {
     my $Draft = RT::Attribute->new( $session{'CurrentUser'} );
-    $Draft->LoadByNameAndObject( Object => $session{'CurrentUser'}, Name => 'Draft-'.$Ticket->id );
+    $Draft->LoadByNameAndObject( Object => $session{'CurrentUser'}->UserObj, Name => 'Draft-'.$Ticket->id );
     $$ARGSRef{'UpdateContent'} = $Draft->Content if ( $Draft && $Draft->Content );
     $$ARGSRef{'UpdateContentType'} = $Draft->ContentType if ( $Draft && $Draft->ContentType );
 }
-- 
2.11.0