Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit 19cf8d4

Browse files
janettejanette
authored
Upgrade dkan to 1.15.4 (#512)
1 parent 40b42bf commit 19cf8d4

137 files changed

Lines changed: 461 additions & 395 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dkan/dkan.info‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,4 @@ dependencies[] = dkan_datastore
125125
dependencies[] = dkan_datastore_api
126126
dependencies[] = open_data_schema_map_dkan
127127
dependencies[] = visualization_entity_charts_dkan
128-
129128
version = 7.x-1.15.4

‎dkan/modules/dkan/dkan_sitewide/dkan_sitewide.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,4 @@ features[variable][] = user_pictures
5656
features[views_view][] = dkan_administration_files
5757
features[views_view][] = dkan_administration_nodes
5858
features[views_view][] = popular_tags
59+
version = 7.x-1.15.4

‎docroot/CHANGELOG.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Drupal 7.60, 2018-10-18
2+
------------------------
3+
- Fixed security issues. See SA-CORE-2018-006.
14

25
Drupal 7.59, 2018-04-25
36
-----------------------

‎docroot/includes/bootstrap.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* The current system version.
1010
*/
11-
define('VERSION', '7.59');
11+
define('VERSION', '7.60');
1212

1313
/**
1414
* Core API compatibility.

‎docroot/includes/common.inc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2311,7 +2311,10 @@ function url($path = NULL, array $options = array()) {
23112311
$language = isset($options['language']) && isset($options['language']->language) ? $options['language']->language : '';
23122312
$alias = drupal_get_path_alias($original_path, $language);
23132313
if ($alias != $original_path) {
2314-
$path = $alias;
2314+
// Strip leading slashes from internal path aliases to prevent them
2315+
// becoming external URLs without protocol. /example.com should not be
2316+
// turned into //example.com.
2317+
$path = ltrim($alias, '/');
23152318
}
23162319
}
23172320

‎docroot/modules/aggregator/aggregator.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ files[] = aggregator.test
77
configure = admin/config/services/aggregator/settings
88
stylesheets[all][] = aggregator.css
99

10-
; Information added by Drupal.org packaging script on 2018-04-25
11-
version = "7.59"
10+
; Information added by Drupal.org packaging script on 2018-10-17
11+
version = "7.60"
1212
project = "drupal"
13-
datestamp = "1524673284"
13+
datestamp = "1539816636"

‎docroot/modules/aggregator/tests/aggregator_test.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version = VERSION
55
core = 7.x
66
hidden = TRUE
77

8-
; Information added by Drupal.org packaging script on 2018-04-25
9-
version = "7.59"
8+
; Information added by Drupal.org packaging script on 2018-10-17
9+
version = "7.60"
1010
project = "drupal"
11-
datestamp = "1524673284"
11+
datestamp = "1539816636"

‎docroot/modules/block/block.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ core = 7.x
66
files[] = block.test
77
configure = admin/structure/block
88

9-
; Information added by Drupal.org packaging script on 2018-04-25
10-
version = "7.59"
9+
; Information added by Drupal.org packaging script on 2018-10-17
10+
version = "7.60"
1111
project = "drupal"
12-
datestamp = "1524673284"
12+
datestamp = "1539816636"

‎docroot/modules/block/tests/block_test.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version = VERSION
55
core = 7.x
66
hidden = TRUE
77

8-
; Information added by Drupal.org packaging script on 2018-04-25
9-
version = "7.59"
8+
; Information added by Drupal.org packaging script on 2018-10-17
9+
version = "7.60"
1010
project = "drupal"
11-
datestamp = "1524673284"
11+
datestamp = "1539816636"

‎docroot/modules/block/tests/themes/block_test_theme/block_test_theme.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ regions[footer] = Footer
1313
regions[highlighted] = Highlighted
1414
regions[help] = Help
1515

16-
; Information added by Drupal.org packaging script on 2018-04-25
17-
version = "7.59"
16+
; Information added by Drupal.org packaging script on 2018-10-17
17+
version = "7.60"
1818
project = "drupal"
19-
datestamp = "1524673284"
19+
datestamp = "1539816636"

0 commit comments

Comments
 (0)