From: Evan Prodromou <evan@status.net>
Date: Tue, 13 Oct 2009 21:25:54 +0000 (-0400)
Subject: Merge branch '0.8.x' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=67c387c6a0dc80a5c9beac9d73717763a2ba96f4;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into 0.9.x

Conflicts:
	install.php
---

67c387c6a0dc80a5c9beac9d73717763a2ba96f4
diff --cc install.php
index 69f025a6a6,425ea91ef8..319c261e41
--- a/install.php
+++ b/install.php
@@@ -381,11 -314,12 +381,11 @@@ function showLibs(
      <h2>Absent Libraries</h2>
      <ul id="absent_libraries">
  E_O_T;
 -    foreach($absent_libraries as $library)
 -    {
 +    foreach ($absent_libraries as $library) {
          echo '<li>';
 -        if(isset($library['url'])){
 +        if (isset($library['url'])) {
-             echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
+             echo '<a href="'.$library['url'].'">'.htmlentities($library['name']).'</a>';
 -        }else{
 +        } else {
              echo htmlentities($library['name']);
          }
          echo '<ul>';
@@@ -405,11 -339,12 +405,11 @@@
      <h2>Installed Libraries</h2>
      <ul id="present_libraries">
  E_O_T;
 -    foreach($present_libraries as $library)
 -    {
 +    foreach ($present_libraries as $library) {
          echo '<li>';
 -        if(isset($library['url'])){
 +        if (isset($library['url'])) {
-             echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
+             echo '<a href="'.$library['url'].'">'.htmlentities($library['name']).'</a>';
 -        }else{
 +        } else {
              echo htmlentities($library['name']);
          }
          echo '</li>';