Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	install.php
	lib/noticeform.php
This commit is contained in:
Evan Prodromou
2009-09-24 17:22:51 -04:00
10 changed files with 474 additions and 200 deletions

View File

@@ -244,7 +244,7 @@ function main()
*/
function haveExternalLibrary($external_library)
{
if (isset($external_library['include']) && ! @include_once $external_library['include'] ) {
if (isset($external_library['include']) && !haveIncludeFile($external_library['include'])) {
return false;
}
if (isset($external_library['check_function']) && ! function_exists($external_library['check_function'])) {