Commit 9fa6ff02 authored by Kevin Kromjong's avatar Kevin Kromjong Committed by Jeroen Tubex
Browse files

Issue #2937269 by hctom, kevinkromjong: Cannot load admin form because of incorrect query

parent f035a9bf
Loading
Loading
Loading
Loading
+3 −3
Changes for webform_purge.module: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ function webform_purge_cron() {
      $purge_timestamp = strtotime(date('Y-m-d H:i:s') . ' -' . $days_to_retain . ' day');

      // Get the records elegible for purging.
      $query = db_query('SELECT * FROM {webform_submissions} WHERE webform_submissions.submitted < :purge_timestamp', array(':purge_timestamp' => $purge_timestamp));
      $query = db_query('SELECT * FROM {webform_submissions} WHERE submitted < :purge_timestamp', array(':purge_timestamp' => $purge_timestamp));
      $rows = $query->fetchAll();

      // If submissions found to purge, get on with it.
@@ -195,11 +195,11 @@ function webform_purge_admin_settings_form($node, &$form_state) {

    foreach ($webforms as $webform) {
      // Get the number of submissions for this webform.
      $query = db_query('SELECT nid FROM {webform_submissions} WHERE webform_submissions.nid = :nid', array(':nid' => $webform->nid));
      $query = db_query('SELECT nid FROM {webform_submissions} WHERE nid = :nid', array(':nid' => $webform->nid));
      $rowcount = number_format($query->rowCount());

      // Get the oldest date for this webform.
      $query = db_query('SELECT MIN(webform_submissions.submitted) as oldest_date FROM {webform_submissions} WHERE webform_submissions.nid = :nid', array(':nid' => $webform->nid));
      $query = db_query('SELECT MIN(submitted) as oldest_date FROM {webform_submissions} WHERE nid = :nid', array(':nid' => $webform->nid));
      $submissions = $query->fetch();
      $oldest_date = ($submissions->oldest_date == NULL) ? "-" : date('Y-m-d', $submissions->oldest_date);