[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.1-179-g59014a4

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  59014a452177ac4365e9ab2e1fd4890440df4ff1 (commit)
       via  50aa0a69a0c09f1d4e28bf80e914e993ff58153f (commit)
       via  5e228fc4680c204bd6f67f2747a7fe33269ce571 (commit)
       via  7e24399a7d0139e6da1544a4f8f60a2ac7310192 (commit)
       via  e7f321415aa73d348a5cb2e8327701999c77a078 (commit)
       via  8d087e34ca71093af661bc5f766a5985ae7097af (commit)
       via  a4d1f5f7f9ed9eaa03447ba1b24ecdcb6386ee54 (commit)
       via  d277f6cd15e3ecbcac2cdde87f7cc41f6afe17fb (commit)
      from  5322a913820de8144c56eae7fa9fe0779c409c7c (commit)

Summary of changes:
 docs/customizing/lifecycles.pod | 4 ----
 lib/RT.pm                       | 4 +++-
 sbin/rt-server.in               | 2 +-
 share/html/Elements/Footer      | 2 +-
 share/html/m/_elements/footer   | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 59014a452177ac4365e9ab2e1fd4890440df4ff1
Merge: 5322a91 50aa0a6
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jan 7 14:06:00 2014 -0500

    Merge branch '4.0-trunk' into 4.2-trunk
    
    Conflicts:
    	devel/tools/factory
    	lib/RT/Tickets_SQL.pm
    	share/html/Admin/Elements/EditScrip
    	share/html/Admin/Elements/ListGlobalCustomFields
    	share/html/Admin/Elements/SelectRights
    	share/html/Elements/SelectTicketTypes
    	share/html/NoAuth/RichText/dhandler
    	share/html/NoAuth/css/aileron/base.css
    	share/html/NoAuth/css/aileron/forms.css
    	share/html/NoAuth/css/aileron/images/dhandler
    	share/html/NoAuth/css/aileron/layout.css
    	share/html/NoAuth/css/aileron/main.css
    	share/html/NoAuth/css/aileron/misc.css
    	share/html/NoAuth/css/aileron/msie.css
    	share/html/NoAuth/css/aileron/msie6.css
    	share/html/NoAuth/css/aileron/ticket.css
    	share/html/NoAuth/css/ballard/base.css
    	share/html/NoAuth/css/ballard/images/dhandler
    	share/html/NoAuth/css/ballard/layout.css
    	share/html/NoAuth/css/ballard/main.css
    	share/html/NoAuth/css/ballard/misc.css
    	share/html/NoAuth/css/ballard/msie6.css
    	share/html/NoAuth/css/ballard/ticket.css
    	share/html/NoAuth/css/base/admin.css
    	share/html/NoAuth/css/base/articles.css
    	share/html/NoAuth/css/base/collection.css
    	share/html/NoAuth/css/base/login.css
    	share/html/NoAuth/css/base/main.css
    	share/html/NoAuth/css/base/misc.css
    	share/html/NoAuth/css/base/msie6.css
    	share/html/NoAuth/css/base/nav.css
    	share/html/NoAuth/css/base/portlets.css
    	share/html/NoAuth/css/base/theme-editor.css
    	share/html/NoAuth/css/base/ticket-form.css
    	share/html/NoAuth/css/base/ticket.css
    	share/html/NoAuth/css/base/tools.css
    	share/html/NoAuth/css/print.css
    	share/html/NoAuth/css/web2/base.css
    	share/html/NoAuth/css/web2/images/dhandler
    	share/html/NoAuth/css/web2/main.css
    	share/html/NoAuth/css/web2/misc.css
    	share/html/NoAuth/css/web2/msie6.css
    	share/html/NoAuth/css/web2/ticket.css
    	share/html/NoAuth/images/autohandler
    	share/html/NoAuth/js/jquery-ui-patch-datepicker.js
    	share/html/NoAuth/js/jquery_noconflict.js
    	share/html/NoAuth/js/late.js
    	share/html/NoAuth/js/userautocomplete.js
    	share/html/REST/1.0/search/ticket
    	share/html/Search/Graph.html
    	share/html/Ticket/Elements/ShowDependencies
    	share/html/Ticket/Elements/ShowHistory
    	share/html/Ticket/Elements/ShowTransaction
    	share/html/Ticket/Elements/ShowUserEntry
    	share/html/Tools/Offline.html
    	share/static/css/aileron/boxes.css
    	share/static/css/aileron/nav.css
    	share/static/css/aileron/ticket-lists.css
    	share/static/css/aileron/ticket-search.css
    	share/static/css/ballard/boxes.css
    	share/static/css/ballard/msie.css
    	share/static/css/ballard/nav.css
    	share/static/css/ballard/ticket-lists.css
    	share/static/css/ballard/ticket-search.css
    	share/static/css/base/forms.css
    	share/static/css/base/rights-editor.css
    	share/static/css/mobile.css
    	share/static/css/web2/boxes.css
    	share/static/css/web2/layout.css
    	share/static/css/web2/msie.css
    	share/static/css/web2/nav.css
    	share/static/css/web2/ticket-lists.css
    	share/static/css/web2/ticket-search.css
    	share/static/js/cascaded.js
    	share/static/js/combobox.js
    	share/static/js/util.js

diff --cc lib/RT.pm
index bb067d5,d055aab..17aaffb
--- a/lib/RT.pm
+++ b/lib/RT.pm
@@@ -189,13 -191,12 +191,13 @@@ sub Init 
      #Get a database connection
      ConnectToDatabase();
      InitSystemObjects();
-     InitClasses();
+     InitClasses(%args);
      InitLogging();
      InitPlugins();
 +    _BuildTableAttributes();
      RT::I18N->Init;
      RT->Config->PostLoadCheck;
 -
 +    RT::Lifecycle->new->FillCache;
  }
  
  =head2 ConnectToDatabase

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