Development

Changeset 8367

You must first sign up to be able to contribute.

Changeset 8367

Show
Ignore:
Timestamp:
04/09/08 01:36:17 (8 months ago)
Author:
dwhittle
Message:

dwhittle: merged changes to branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/1.1/lib/exception/data/exception.php

    r7918 r8367  
    2222  #content { padding: 3em; margin: 2em auto; border: 1px solid #ddd; background-color: #fff; text-align:left; -moz-border-radius: 10px; min-width: 20em; max-width: 80em } 
    2323  #message { padding: 10px; margin-bottom: 10px; background-color: #eee; -moz-border-radius: 10px } 
    24   #sf_settings, #sf_request, #sf_response, #sf_globals { display: none; } 
     24  #sf_settings, #sf_request, #sf_response, #sf_user, #sf_globals { display: none; } 
    2525  </style> 
    2626  <script type="text/javascript"> 
    …… 
    4949    <div id="sf_response"><?php echo $responseTable ?></div> 
    5050 
     51    <h2>user <a href="#" onclick="toggle('sf_user'); return false;">...</a></h2> 
     52    <div id="sf_user"><?php echo $userTable ?></div> 
     53 
    5154    <h2>global vars <a href="#" onclick="toggle('sf_globals'); return false;">...</a></h2> 
    5255    <div id="sf_globals"><?php echo $globalsTable ?></div> 

  • branches/dwhittle/1.1/lib/exception/sfException.class.php

    r8315 r8367  
    167167      $requestTable  = self::formatArrayAsHtml(sfDebug::requestAsArray($context->getRequest())); 
    168168      $responseTable = self::formatArrayAsHtml(sfDebug::responseAsArray($context->getResponse())); 
     169      $userTable     = self::formatArrayAsHtml(sfDebug::userAsArray($context->getUser())); 
    169170      $globalsTable  = self::formatArrayAsHtml(sfDebug::globalsAsArray()); 
    170171    }