Commit 7cb89fa6c5de715074b562e087a90adedf2fd743

Authored by jarrett
1 parent ed56f669

Story Id: 964068 Fixed Conflicts

Committed by: Jarrett Jordaan

Reviewed by: Paul Barrett
setup/wizard/steps/dependencies.php
@@ -136,6 +136,7 @@ class dependencies extends Step @@ -136,6 +136,7 @@ class dependencies extends Step
136 $this->done = false; 136 $this->done = false;
137 $this->temp_variables['php_ext'] = 'cross'; 137 $this->temp_variables['php_ext'] = 'cross';
138 $this->error[] = 'Missing required extension: '.$ext['name']; 138 $this->error[] = 'Missing required extension: '.$ext['name'];
  139 + $this->error[$ext['extension']] = 'Missing required extension: '.$ext['name'];
139 } 140 }
140 } 141 }
141 142
setup/wizard/templates/dependencies.tpl
@@ -52,6 +52,7 @@ The following determines your PHP installation environment. The extensions are r @@ -52,6 +52,7 @@ The following determines your PHP installation environment. The extensions are r
52 $row .= "<td><div class='{$class}'></div></td>"; 52 $row .= "<td><div class='{$class}'></div></td>";
53 $row .= "<td>{$ext['name']}</td>"; 53 $row .= "<td>{$ext['name']}</td>";
54 $row .= ($ext['available'] != 'yes') ? "<td>{$ext['details']}</td>" : '<td></td>'; 54 $row .= ($ext['available'] != 'yes') ? "<td>{$ext['details']}</td>" : '<td></td>';
  55 + $row .= isset($errors[$ext['extension']]) ? "<td><span class='error'>{$errors[$ext['extension']]}</span></td>" : '<td></td>';
55 $row .= '</tr>'; 56 $row .= '</tr>';
56 echo $row."\n"; 57 echo $row."\n";
57 } 58 }