[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2deb25817573b3761b8644e120794dd3c63f7877

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  2deb25817573b3761b8644e120794dd3c63f7877 (commit)
      from  47879808611511f8db11b5f3d6831151543531bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2deb25817573b3761b8644e120794dd3c63f7877
Author: Mike Rylander <mrylander at gmail.com>
Date:   Thu Jul 11 12:31:37 2013 -0400

    Unbreaking wrong-direction conflict resolution from previous commit
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
index 13870af..4ed79c7 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
@@ -517,8 +517,8 @@ sub __format_holds {
     }
 
     return (defined $start and defined $end) ? 
-        [ @holds[($start-1)..($end-1)] ] :
-        \@holds;
+        [ @response[($start-1)..($end-1)] ] :
+        \@response;
 }
 
 # Finds a representative copy for the given hold.

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS