From: Evan Prodromou <evan@status.net>
Date: Thu, 24 Sep 2009 21:22:51 +0000 (-0400)
Subject: Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=78cec7ab87c005e988dbd8176585ffad9182d25c;p=quix0rs-gnu-social.git

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

Conflicts:
	install.php
	lib/noticeform.php
---

78cec7ab87c005e988dbd8176585ffad9182d25c
diff --cc install.php
index c2ca7e1196,3786b6db17..c2a5bb29ee
--- a/install.php
+++ b/install.php
@@@ -244,7 -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'])){
++    if (isset($external_library['include']) && !haveIncludeFile($external_library['include'])) {
          return false;
      }
      if (isset($external_library['check_function']) && ! function_exists($external_library['check_function'])) {
diff --cc lib/noticeform.php
index ce8f9c6530,62320dd602..186330bf1c
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@@ -90,7 -90,6 +90,7 @@@ class NoticeForm extends For
          $this->action  = $action;
          $this->content = $content;
          $this->inreplyto = $inreplyto;
-         
++
          if ($user) {
              $this->user = $user;
          } else {