From 7cb89fa6c5de715074b562e087a90adedf2fd743 Mon Sep 17 00:00:00 2001
From: jarrett <jarrett@jarrett-desktop.(none)>
Date: Wed, 19 Aug 2009 12:47:00 +0200
Subject: [PATCH] Story Id: 964068 Fixed Conflicts

---
 setup/wizard/steps/dependencies.php     | 1 +
 setup/wizard/templates/dependencies.tpl | 1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/setup/wizard/steps/dependencies.php b/setup/wizard/steps/dependencies.php
index 0572570..b255d17 100644
--- a/setup/wizard/steps/dependencies.php
+++ b/setup/wizard/steps/dependencies.php
@@ -136,6 +136,7 @@ class dependencies extends Step
                     $this->done = false;
                     $this->temp_variables['php_ext'] = 'cross';
                     $this->error[] = 'Missing required extension: '.$ext['name'];
+                    $this->error[$ext['extension']] = 'Missing required extension: '.$ext['name'];
                 }
             }
 
diff --git a/setup/wizard/templates/dependencies.tpl b/setup/wizard/templates/dependencies.tpl
index ffc45fd..bed18cc 100644
--- a/setup/wizard/templates/dependencies.tpl
+++ b/setup/wizard/templates/dependencies.tpl
@@ -52,6 +52,7 @@ The following determines your PHP installation environment. The extensions are r
         $row .= "<td><div class='{$class}'></div></td>";
         $row .= "<td>{$ext['name']}</td>";
         $row .= ($ext['available'] != 'yes') ? "<td>{$ext['details']}</td>" : '<td></td>';
+        $row .= isset($errors[$ext['extension']]) ? "<td><span class='error'>{$errors[$ext['extension']]}</span></td>" : '<td></td>';
         $row .= '</tr>';
         echo $row."\n";
     }
--
libgit2 0.21.4