Re: two bugs - I fixed it
I do not agree with your first fix. Replacing a conditional test by if ( true ) isn't acceptable -or only for you-. From the PHP documentation the php_sapi_name() function exists since PHP 4 so I must understand that its output didn't fit your expectations.
The second issue has been fixed in a more esthetical way in the next 2.1.3 sub version.
Thanks for your feedback.