Projet

Général

Profil

Révision 599a39cd

Ajouté par Assos Assos il y a environ 3 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/date/date_api/date_api.install
128 128 
  // 'date_format_type' table.
129 129 
  if (db_table_exists('date_format_types')) {
130 130 
    // Find all the custom entries in the D6 table.
131 
    $result = db_select('date_format_types', 'old')
132 
      ->fields('old', array('type', 'title', 'locked'))
131 
    $result = db_select('date_format_types', 'old_formats')
132 
      ->fields('old_formats', array('type', 'title', 'locked'))
133 133 
      ->condition('locked', 0)
134 134 
      ->execute()
135 135 
      ->fetchAll(PDO::FETCH_ASSOC);
......
138 138 
    foreach ($result as $row) {
139 139 
      // See if this value already exists in the new table
140 140 
      // (it might have been added manually before this update got run).
141 
      $count = db_select('date_format_type', 'new')
141 
      $count = db_select('date_format_type', 'new_formats')
142 142 
        ->condition('type', $row['type'])
143 143 
        ->countQuery()
144 144 
        ->execute()
......
167 167 
  // 'd6_date_formats') to the new 'date_formats' table.
168 168 
  if (db_table_exists('d6_date_formats')) {
169 169 
    // Find all the custom entries in the D6 table.
170 
    $result = db_select('d6_date_formats', 'old')
171 
      ->fields('old', array('format', 'type', 'locked'))
170 
    $result = db_select('d6_date_formats', 'old_formats')
171 
      ->fields('old_formats', array('format', 'type', 'locked'))
172 172 
      ->condition('type', 'custom')
173 173 
      ->execute()
174 174 
      ->fetchAll(PDO::FETCH_ASSOC);
......
177 177 
    foreach ($result as $row) {
178 178 
      // See if this value already exists in the new table (it might have been
179 179 
      // added manually before this update got run).
180 
      $count = db_select('date_formats', 'new')
180 
      $count = db_select('date_formats', 'new_formats')
181 181 
        ->condition('format', $row['format'])
182 182 
        ->condition('type', $row['type'])
183 183 
        ->countQuery()
......
205 205 
  // to 'd6_date_format_locale') to the new 'date_format_locale' table.
206 206 
  if (db_table_exists('d6_date_format_locale')) {
207 207 
    // Find all the custom entries in the D6 table.
208 
    $result = db_select('d6_date_format_locale', 'old')
209 
      ->fields('old', array('format', 'type', 'language'))
208 
    $result = db_select('d6_date_format_locale', 'old_formats')
209 
      ->fields('old_formats', array('format', 'type', 'language'))
210 210 
      ->condition('type', 'custom')
211 211 
      ->execute()
212 212 
      ->fetchAll(PDO::FETCH_ASSOC);
......
215 215 
    foreach ($result as $row) {
216 216 
      // See if this value already exists in the new table (it might have been
217 217 
      // added manually before this update got run).
218 
      $count = db_select('date_format_locale', 'new')
218 
      $count = db_select('date_format_locale', 'new_formats')
219 219 
        ->condition('format', $row['format'])
220 220 
        ->condition('type', $row['type'])
221 221 
        ->condition('language', $row['language'])

Formats disponibles : Unified diff