Projet

Général

Profil

Révision 4444412d

Ajouté par Julien Enselme il y a presque 10 ans

Update drupal 7.27 -> 7.28

Voir les différences:

drupal7/includes/common.inc
458 458
  $result = array();
459 459
  if (!empty($query)) {
460 460
    foreach (explode('&', $query) as $param) {
461
      $param = explode('=', $param);
461
      $param = explode('=', $param, 2);
462 462
      $result[$param[0]] = isset($param[1]) ? rawurldecode($param[1]) : '';
463 463
    }
464 464
  }
......
1426 1426
 *   valid UTF-8.
1427 1427
 *
1428 1428
 * @see drupal_validate_utf8()
1429
 * @ingroup sanitization
1430 1429
 */
1431 1430
function filter_xss($string, $allowed_tags = array('a', 'em', 'strong', 'cite', 'blockquote', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd')) {
1432 1431
  // Only operate on valid UTF-8 strings. This is necessary to prevent cross
......
5067 5066
 * @param $value
5068 5067
 *   An additional value to base the token on.
5069 5068
 *
5069
 * The generated token is based on the session ID of the current user. Normally,
5070
 * anonymous users do not have a session, so the generated token will be
5071
 * different on every page request. To generate a token for users without a
5072
 * session, manually start a session prior to calling this function.
5073
 *
5070 5074
 * @return string
5071 5075
 *   A 43-character URL-safe token for validation, based on the user session ID,
5072 5076
 *   the hash salt provided from drupal_get_hash_salt(), and the
......
5290 5294
    $end = time() + (isset($info['time']) ? $info['time'] : 15);
5291 5295
    $queue = DrupalQueue::get($queue_name);
5292 5296
    while (time() < $end && ($item = $queue->claimItem())) {
5293
      $function($item->data);
5294
      $queue->deleteItem($item);
5297
      try {
5298
        $function($item->data);
5299
        $queue->deleteItem($item);
5300
      }
5301
      catch (Exception $e) {
5302
        // In case of exception log it and leave the item in the queue
5303
        // to be processed again later.
5304
        watchdog_exception('cron', $e);
5305
      }
5295 5306
    }
5296 5307
  }
5297 5308
  // Restore the user.
......
5946 5957
/**
5947 5958
 * Renders children of an element and concatenates them.
5948 5959
 *
5949
 * This renders all children of an element using drupal_render() and then
5950
 * joins them together into a single string.
5951
 *
5952
 * @param $element
5960
 * @param array $element
5953 5961
 *   The structured array whose children shall be rendered.
5954
 * @param $children_keys
5955
 *   If the keys of the element's children are already known, they can be passed
5956
 *   in to save another run of element_children().
5962
 * @param array $children_keys
5963
 *   (optional) If the keys of the element's children are already known, they
5964
 *   can be passed in to save another run of element_children().
5965
 *
5966
 * @return string
5967
 *   The rendered HTML of all children of the element.
5968

  
5969
 * @see drupal_render()
5957 5970
 */
5958 5971
function drupal_render_children(&$element, $children_keys = NULL) {
5959 5972
  if ($children_keys === NULL) {
......
7827 7840
}
7828 7841

  
7829 7842
/**
7830
 * Get the entity controller class for an entity type.
7843
 * Gets the entity controller for an entity type.
7844
 *
7845
 * @return DrupalEntityControllerInterface
7846
 *   The entity controller object for the specified entity type.
7831 7847
 */
7832 7848
function entity_get_controller($entity_type) {
7833 7849
  $controllers = &drupal_static(__FUNCTION__, array());

Formats disponibles : Unified diff