summaryrefslogtreecommitdiff
path: root/install.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-09-24 17:22:51 -0400
committerEvan Prodromou <evan@status.net>2009-09-24 17:22:51 -0400
commit78cec7ab87c005e988dbd8176585ffad9182d25c (patch)
tree735c4755433140939e6b841f971a273c6a2f76f8 /install.php
parent8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac (diff)
parent49bce941a9aae495ee7221bd367791227487b458 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts: install.php lib/noticeform.php
Diffstat (limited to 'install.php')
-rw-r--r--install.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.php b/install.php
index c2ca7e119..c2a5bb29e 100644
--- a/install.php
+++ b/install.php
@@ -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'])) {