updated core to 7.73
This commit is contained in:
+7
-4
@@ -391,7 +391,7 @@ function drupal_add_feed($url = NULL, $title = '') {
|
||||
*/
|
||||
function drupal_get_feeds($delimiter = "\n") {
|
||||
$feeds = drupal_add_feed();
|
||||
return implode($feeds, $delimiter);
|
||||
return implode($delimiter, $feeds);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -684,7 +684,10 @@ function drupal_goto($path = '', array $options = array(), $http_response_code =
|
||||
// We do not allow absolute URLs to be passed via $_GET, as this can be an attack vector.
|
||||
if (isset($_GET['destination']) && !url_is_external($_GET['destination'])) {
|
||||
$destination = drupal_parse_url($_GET['destination']);
|
||||
$path = $destination['path'];
|
||||
// Double check the path derived by drupal_parse_url() is not external.
|
||||
if (!url_is_external($destination['path'])) {
|
||||
$path = $destination['path'];
|
||||
}
|
||||
$options['query'] = $destination['query'];
|
||||
$options['fragment'] = $destination['fragment'];
|
||||
}
|
||||
@@ -3740,7 +3743,7 @@ function _drupal_build_css_path($matches, $base = NULL) {
|
||||
}
|
||||
|
||||
// Prefix with base and remove '../' segments where possible.
|
||||
$path = $_base . $matches[1];
|
||||
$path = $_base . (isset($matches[1]) ? $matches[1] : '');
|
||||
$last = '';
|
||||
while ($path != $last) {
|
||||
$last = $path;
|
||||
@@ -6653,7 +6656,7 @@ function element_children(&$elements, $sort = FALSE) {
|
||||
$children = array();
|
||||
$sortable = FALSE;
|
||||
foreach ($elements as $key => $value) {
|
||||
if ($key === '' || $key[0] !== '#') {
|
||||
if (is_int($key) || $key === '' || $key[0] !== '#') {
|
||||
$children[$key] = $value;
|
||||
if (is_array($value) && isset($value['#weight'])) {
|
||||
$sortable = TRUE;
|
||||
|
||||
Reference in New Issue
Block a user