Projet

Général

Profil

Révision 99781f3b

Ajouté par Assos Assos il y a plus de 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/token/token.install
21 21
        $problems = array_unique($problem['problems']);
22 22
        $problems = array_map('check_plain', $problems);
23 23
        $token_problems[$problem_key] = $problem['label'] . theme('item_list', array('items' => $problems));
24
        $requirements['token-' . $problem_key] = array(
25
          'title' => $problem['label'],
26
          'value' => theme('item_list', array('items' => $problems)),
27
          'severity' => $problem['severity'],
28
        );
24 29
      }
25
      else {
26
        unset($token_problems[$problem_key]);
27
      }
28
    }
29
    if (!empty($token_problems)) {
30
      $requirements['token_problems'] = array(
31
        'title' => $t('Tokens'),
32
        'value' => $t('Problems detected'),
33
        'severity' => REQUIREMENT_WARNING,
34
        'description' => '<p>' . implode('</p><p>', $token_problems) . '</p>', //theme('item_list', array('items' => $token_problems)),
35
      );
36 30
    }
37 31
  }
38 32

  
......
272 266
  $token_info = token_info();
273 267
  $token_problems = array(
274 268
    'not-array' => array(
275
      'label' => t('The following tokens or token types are not defined as arrays:'),
269
      'label' => t('Tokens or token types not defined as arrays'),
270
      'severity' => REQUIREMENT_ERROR,
276 271
    ),
277 272
    'missing-info' => array(
278
      'label' => t('The following tokens or token types are missing required name and/or description information:'),
273
      'label' => t('Tokens or token types missing name property'),
274
      'severity' => REQUIREMENT_WARNING,
279 275
    ),
280 276
    'type-no-tokens' => array(
281
      'label' => t('The following token types do not have any tokens defined:'),
277
      'label' => t('Token types do not have any tokens defined'),
278
      'severity' => REQUIREMENT_INFO,
282 279
    ),
283 280
    'tokens-no-type' => array(
284
      'label' => t('The following token types are not defined but have tokens:'),
281
      'label' => t('Token types are not defined but have tokens'),
282
      'severity' => REQUIREMENT_INFO,
285 283
    ),
286 284
    'duplicate' => array(
287
      'label' => t('The following token or token types are defined by multiple modules:')
285
      'label' => t('Token or token types are defined by multiple modules'),
286
      'severity' => REQUIREMENT_ERROR,
288 287
    ),
289 288
  );
290 289

  
......
295 294
      $token_problems['not-array']['problems'][] = "\$info['types']['$type']";
296 295
      continue;
297 296
    }
298
    elseif (!isset($type_info['name']) || !isset($type_info['description'])) {
297
    elseif (!isset($type_info['name'])) {
299 298
      $token_problems['missing-info']['problems'][] = "\$info['types']['$type']";
300 299
    }
300
    elseif (is_array($type_info['name'])) {
301
      $token_problems['duplicate']['problems'][] = "\$info['types']['$type']";
302
    }
301 303
    elseif (empty($token_info['tokens'][$real_type])) {
302 304
      $token_problems['type-no-tokens']['problems'][] = "\$info['tokens']['$real_type']";
303 305
    }
......
315 317
          $token_problems['not-array']['problems'][] = "\$info['tokens']['$type']['$token']";
316 318
          continue;
317 319
        }
318
        elseif (!isset($tokens[$token]['name']) || !isset($tokens[$token]['description'])) {
320
        elseif (!isset($tokens[$token]['name'])) {
319 321
          $token_problems['missing-info']['problems'][] = "\$info['tokens']['$type']['$token']";
320 322
        }
321
        elseif (is_array($tokens[$token]['name']) || is_array($tokens[$token]['description'])) {
323
        elseif (is_array($tokens[$token]['name'])) {
322 324
          $token_problems['duplicate']['problems'][] = "\$info['tokens']['$type']['$token']";
323 325
        }
324 326
      }

Formats disponibles : Unified diff