Update results generate an extra </ul>

Hi guys,

There is a bug in the D6 version and the D7 version in regard to generating the list.

Drupal 7.x

In D7, you now create an array of list items and then create the list with an implode and put all of that inside a pair of <ul> </ul>. Then 2 lines below you kept the close tag as follow:

          if ($messages) {
            $output .= '<h4>Update #' . $number . "</h4>\n";
            $output .= '<ul>' . implode("\n", $messages) . "</ul>\n";
          }
        }
        $output .= '</ul>';

That last line is spurious.

Drupal 6.x

In the D6 version, you open and close properly except when you hit a '#abort' in which case you close, close, close...

There is the code and as you can see the $output .= '</ul>'; is after the close } of the if ($number != '#abort') { which means it is added when '#abort' is found. All that's necessary is moving that one line up within the if() statement.

      foreach ($updates as $number => $queries) {
        if ($number != '#abort') {
          $output .= '<h4>Update #'. $number .'</h4>';
          $output .= '<ul>';
          foreach ($queries as $query) {
            if ($query['success']) {
              $output .= '<li class="success">'. $query['query'] .'</li>';
            }
            else {
              $output .= '<li class="failure"><strong>Failed:</strong> '. $query['query'] .'</li>';
            }
          }
          if (!count($queries)) {
            $output .= '<li class="none">No queries</li>';
          }
        }
        $output .= '</ul>';
      }