debian/patches/02-php5.4.diff

   1 Description: Fix for PHP 5.4.
   2  PHP 5.4 seems to handle ob_end_clean() a bit different than previous
   3  versions.
   4 Author: Sebastian Harl <tokkee@debian.org>, Federico <federicot@gmail.com>
   5
   6 --- a/system/core/Kohana.php
   7 +++ b/system/core/Kohana.php
   8 @@ -692,10 +692,9 @@
   9                         Event::run('system.send_headers');
  10                 }
  11
  12 -               self::$output   = $output;
  13 -
  14 -               // Set and return the final output
  15 -               return self::$output;
  16 +               // Set the final output
  17 +               self::$output = $output;
  18 +               return TRUE;
  19         }
  20
  21         /**
  22 @@ -719,7 +719,7 @@
  23                         }
  24
  25                         // Store the Kohana output buffer
  26 -                       ob_end_clean();
  27 +                       ob_end_flush();
  28                 }
  29         }
  30
  31