[Rt-commit] rt branch, query-logging, updated. rt-3.9.4-76-g56e20b8

[Shawn Moore]

The branch, query-logging has been updated
       via  56e20b874e8d67ab93aa80c2c00155110a27e764 (commit)
       via  f6d63916f13949096392272f9ec560d2958df5c8 (commit)
       via  f11ee435fe035efcf521bc7a68d1f7f20b5a3d22 (commit)
       via  35e9f5c85bfcd6ca20d7b961cb32f6ab03cfd68f (commit)
       via  118e340fd3ec6d629e635127b666fe5175e4a92b (commit)
       via  d5b98f7040745786819b0748e0512e912c763c69 (commit)
       via  48bbc7723dada4d392b5d780468ffa0f1eb3300e (commit)
       via  4d570a9963515f1b94ebcdbe91835a731440ca5f (commit)
       via  26de28cb38f30b64d4d450e7d84c70d87970ace6 (commit)
       via  6286f7693764c41f777e3e2cc03a5742d3595097 (commit)
       via  658f4f47ecad84053220399339e7d15d7862a280 (commit)
       via  734691b95b339cb1e4e6a0fc1f1131acc9cbeb36 (commit)
       via  9c7457eef00be9469423f19f83e9d6dec9527d82 (commit)
       via  5218edaa233f301b94d87f566860455c0f45b0fe (commit)
       via  e0d707ddfaa809b379387e4bce87a9b8f39ca21b (commit)
       via  9c250a491880e31b81979d589603cccc3c481a92 (commit)
       via  595021afdaf71d7523f24e4453faf828d7a38f3f (commit)
      from  1f56ce0e38475ff770cdccfc9649eae999c6afb5 (commit)

Summary of changes:
 Makefile.in                                        |   22 +++-------
 configure.ac                                       |    7 +---
 etc/upgrade/3.1.0/acl.Informix                     |    4 --
 etc/upgrade/3.1.0/schema.Informix                  |   17 --------
 etc/upgrade/3.3.0/acl.Informix                     |    4 --
 lib/RT/Handle.pm                                   |   10 +----
 lib/RT/Interface/Web.pm                            |    3 -
 lib/RT/Queue_Overlay.pm                            |    2 +-
 lib/RT/ScripAction_Overlay.pm                      |    8 ++-
 lib/RT/Ticket_Overlay.pm                           |   42 +++++++++++++------
 sbin/rt-setup-database.in                          |    9 +++-
 share/html/Elements/Footer                         |    2 -
 share/html/Elements/Header                         |    6 +--
 share/html/NoAuth/RichText/FCKeditor/UPGRADING     |    4 ++
 .../FCKeditor/editor/css/fck_editorarea.css        |    2 +-
 .../FCKeditor/editor/skins/default/fck_editor.css  |    5 +-
 share/html/NoAuth/RichText/FCKeditor/fckconfig.js  |    2 +-
 share/html/NoAuth/css/base/ticket-form.css         |   14 ++++++-
 share/html/NoAuth/css/site.css                     |    4 ++
 share/html/NoAuth/js/util.js                       |    4 +-
 share/html/Ticket/Display.html                     |    3 +
 share/html/Ticket/Elements/FindTransactions        |   25 ++++++++++++
 share/html/Ticket/Elements/ShowHistory             |   21 +--------
 share/html/Ticket/Elements/ShowTransaction         |    6 ++-
 share/html/Ticket/Update.html                      |   24 +++++++++--
 share/html/autohandler                             |    2 +
 t/web/admin_user.t                                 |   21 ++++++++++
 27 files changed, 157 insertions(+), 116 deletions(-)
 delete mode 100644 etc/upgrade/3.1.0/acl.Informix
 delete mode 100644 etc/upgrade/3.1.0/schema.Informix
 delete mode 100644 etc/upgrade/3.3.0/acl.Informix
 create mode 100644 share/html/NoAuth/RichText/FCKeditor/UPGRADING
 create mode 100644 share/html/NoAuth/css/site.css
 create mode 100644 share/html/Ticket/Elements/FindTransactions
 create mode 100644 t/web/admin_user.t

- Log -----------------------------------------------------------------
commit f6d63916f13949096392272f9ec560d2958df5c8
Merge: 1f56ce0 f11ee43
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Sep 30 18:06:03 2010 -0400

    Merge branch '3.9-trunk' into query-logging
    
    Conflicts:
    	lib/RT/Interface/Web.pm

diff --cc lib/RT/Interface/Web.pm
index 63d6664,f95b9c0..07eb896
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@@ -217,12 -217,7 +217,9 @@@ sub HandleRequest 
      $HTML::Mason::Commands::m->callback( %$ARGS, CallbackName => 'Default', CallbackPage => '/autohandler' );
  
      ShowRequestedPage($ARGS);
- 
-     $HTML::Mason::Commands::m->comp( '/Elements/Footer', %$ARGS );
- 
 -    LogRecordedSQLStatements();
 +    LogRecordedSQLStatements(RequestData => {
 +        Path => $HTML::Mason::Commands::m->request_comp->path,
 +    });
  
      # Process per-page final cleanup callbacks
      $HTML::Mason::Commands::m->callback( %$ARGS, CallbackName => 'Final', CallbackPage => '/autohandler' );

commit 56e20b874e8d67ab93aa80c2c00155110a27e764
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Sep 30 18:06:38 2010 -0400

    We no longer have a CurrentUser in Footer again :/
    
        We need a CurrentUser to make sure they have SuperUser, because
        otherwise we could leak too much information

diff --git a/share/html/Elements/Footer b/share/html/Elements/Footer
index 9a1e50f..d221a66 100755
--- a/share/html/Elements/Footer
+++ b/share/html/Elements/Footer
@@ -76,8 +76,6 @@
 </pre>
 % }
 
-<& /Elements/QueriesAsComment &>
-
   </body>
 </html>
 

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