[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.10-9-g68c5df3

[Kevin Falcone]

The branch, 3.8-trunk has been updated
       via  68c5df33ea845f7c3c8f0386b82bfa8036193315 (commit)
       via  95a89ccdb655e284bddb9269c730c6b842d43bc6 (commit)
       via  35457690becf4d73d09a027dabba9038948ffca0 (commit)
      from  dd979521fbf8f0c92228821721c89fbd3729cdaf (commit)

Summary of changes:
 lib/RT/Base.pm          |    4 ++--
 lib/RT/Interface/Web.pm |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 95a89ccdb655e284bddb9269c730c6b842d43bc6
Merge: dd97952 3545769
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed May 18 14:44:30 2011 -0400

    Merge branch '3.8/no-dollar-underbar' into 3.8-trunk


commit 68c5df33ea845f7c3c8f0386b82bfa8036193315
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Apr 21 17:16:13 2011 -0400

    Cherry pick back d9f6bba062815e698298f6bd04fe312647123011
    
    Ensure we try to load RT::Interface::Web_(Overlay|Local|Vendor).pm
    
    This was broken because RT/Interface/Web.pm declares package
    HTML::Mason::Commands before the _ImportOverlays call.  Other packages
    don't seem to be similarly broken, and we have a better solution in mind
    for 4.2.
    
    As an aside: the new overlay loading requires that you declare a package
    in your overlay (otherwise you're in the RT::Base package).  There's no
    clean way to require a file in the context of a specific package without
    hardcoding the package name, so we can't just fix _ImportOverlays to
    declare a package for you.
    
    See ticket #17170 and http://lists.bestpractical.com/pipermail/rt-devel/2011-April/011446.html

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index f56abb3..6062585 100755
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -2299,6 +2299,7 @@ sub _parse_saved_search {
     return ( _load_container_object( $obj_type, $obj_id ), $search_id );
 }
 
+package RT::Interface::Web;
 RT::Base->_ImportOverlays();
 
 1;

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