Skip to content

Commit 58704c7

Browse files
committed
Merge pull request #46 from gmarsay/gm-fix-01
Fix sfAutoload and sfCommandApplication
2 parents a29486c + d5e9aa5 commit 58704c7

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lib/autoload/sfAutoload.class.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ public function reloadClasses($force = false)
129129
self::$freshCache = false;
130130
if ($force)
131131
{
132-
unlink($configuration->getConfigCache()->getCacheName('config/autoload.yml'));
132+
if (file_exists($configuration->getConfigCache()->getCacheName('config/autoload.yml')))
133+
{
134+
unlink($configuration->getConfigCache()->getCacheName('config/autoload.yml'));
135+
}
133136
}
134137
}
135138

lib/command/sfCommandApplication.class.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,11 @@ protected function strlen($string)
557557
protected function fixCgi()
558558
{
559559
// handle output buffering
560-
@ob_end_flush();
560+
if (ob_get_level() > 0)
561+
{
562+
@ob_end_flush();
563+
}
564+
561565
ob_implicit_flush(true);
562566

563567
// PHP ini settings

0 commit comments

Comments
 (0)