Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 7 additions and 2 deletions.
  1. +3 −1 lib/vendor/Kint/Kint.class.php
  2. +4 −1 modules/iceGlobalModule/actions/actions.class.php
View
4 lib/vendor/Kint/Kint.class.php
@@ -522,7 +522,9 @@ private static function _debugPath($file, $line = NULL)
private static function _kintLine($file, $line = NULL)
{
- define('DIR_ROOT', realpath( __DIR__ . '/../../../../' ) . '/');
+ if ( !defined('DIR_ROOT') ) {
+ define('DIR_ROOT', realpath( __DIR__ . '/../../../../' ) . '/');
+ }
if (strpos($file, DIR_ROOT) === 0) {
$shortenedName = 'DIR_ROOT' . DIRECTORY_SEPARATOR . substr($file, strlen(DIR_ROOT));
View
5 modules/iceGlobalModule/actions/actions.class.php
@@ -55,7 +55,10 @@ public function executeCaptchaImage(sfRequest $request)
/**
* @see http://php-fpm.org/wiki/Features#fastcgi_finish_request.28.29
*/
- fastcgi_finish_request();
+ if (sfConfig::get('app_ice_captcha_early_fcgi_finish_request', true))
+ {
+ fastcgi_finish_request();
+ }
$captchas = sfContext::getInstance()->getUser()->getAttribute('captchas', array(), 'ice_captcha');
$captchas = array_reverse($captchas);

No commit comments for this range

Something went wrong with that request. Please try again.