Merge pull request #1593 from sylus/7.x-1.x

Updates for 1.x branch.

CHANGELOG.md

@@ -7,6 +7,10 @@ Security Update(s):
   - Drupal Core
   - Services
 
+Performance Update(s)
+
+  - Two patches to Drupal Core
+
 Features:
 
   - Updates to Media + File Entity (Dev to Stable tags)
@@ -15,6 +19,8 @@ Features:
 
 Fixes:
 
+  - (Commit: [2ebdbaa][R1.8-Commit-2ebdbaa]) Issue #[2387925][R1.8-Issue-2387925]: Release 1.8 blocker + Drupal 7.33 performance
+  - (Commit: [c40c182][R1.8-Commit-c40c182]) Update Changelog File for 1.x branch.
   - (Commit: [0b4acde][R1.8-Commit-0b4acde]) Update WetKit Omega for Fix for theme hook registry issue with latest Omega.
   - (Commit: [461a9ab][R1.8-Commit-461a9ab]) Prepare for 1.8 release.
   - (Commit: [68cc5a3][R1.8-Commit-68cc5a3]) Update WetKit Core for Update Panopoly Magic to latest official 1.14 version.
@@ -650,6 +656,10 @@ Bug Fixes:
 
 <!-- Commits R1.8 -->
 
+[R1.8-Commit-b74064b]: http://drupalcode.org/project/wetkit.git/commit/b74064b
+[R1.8-Commit-2ebdbaa]: http://drupalcode.org/project/wetkit.git/commit/2ebdbaa
+[R1.8-Commit-0127ecb]: http://drupalcode.org/project/wetkit.git/commit/0127ecb
+[R1.8-Commit-c40c182]: http://drupalcode.org/project/wetkit.git/commit/c40c182
 [R1.8-Commit-0b4acde]: http://drupalcode.org/project/wetkit.git/commit/0b4acde
 [R1.8-Commit-166b36e]: http://drupalcode.org/project/wetkit.git/commit/166b36e
 [R1.8-Commit-342a934]: http://drupalcode.org/project/wetkit.git/commit/342a934
@@ -704,6 +714,7 @@ Bug Fixes:
 
 <!-- Issues R1.8 -->
 
+[R1.8-Issue-2387925]: http://drupal.org/node/2387925
 [R1.8-Issue-2129273]: http://drupal.org/node/2129273
 [R1.8-Issue-2382711]: http://drupal.org/node/2382711
 [R1.8-Issue-2382711]: http://drupal.org/node/2382711

build-wetkit-release.make

@@ -5,4 +5,4 @@ core = 7.x
 projects[drupal][version] = 7.34
 
 projects[wetkit][type] = profile
-projects[wetkit][version] = 1.7
+projects[wetkit][version] = 1.8

drupal-org-core.make

@@ -11,3 +11,5 @@ projects[drupal][patch][1470656] = http://drupal.org/files/drupal-1470656-14.pat
 projects[drupal][patch][865536]  = http://drupal.org/files/drupal-865536-204.patch
 projects[drupal][patch][1772316] = http://drupal.org/files/drupal7-allow_change_system-requirements-1772316-18.patch
 projects[drupal][patch][2289867] = http://drupal.org/files/issues/D7_port_fix_w3c_url_validation_html5_changes-2289867-1.patch
+projects[drupal][patch][1081266] = http://drupal.org/files/drupal-1081266-102-drupal_get_filename-D7.patch
+projects[drupal][patch][2383823] = http://drupal.org/files/issues/2383823-check_name_empty-1.patch

drupal-org-release.make

@@ -3,37 +3,37 @@ core = 7.x
 
 ; WxT Foundation (Custom)
 
-projects[wetkit_admin][version] = 1.6
+projects[wetkit_admin][version] = 1.7
 projects[wetkit_admin][subdir] = custom
 
-projects[wetkit_bean][version] = 1.7
+projects[wetkit_bean][version] = 1.8
 projects[wetkit_bean][subdir] = custom
 
-projects[wetkit_breadcrumbs][version] = 1.5
+projects[wetkit_breadcrumbs][version] = 1.6
 projects[wetkit_breadcrumbs][subdir] = custom
 
-projects[wetkit_core][version] = 1.15
+projects[wetkit_core][version] = 1.16
 projects[wetkit_core][subdir] = custom
 
 projects[wetkit_demo][version] = 1.1
 projects[wetkit_demo][subdir] = custom
 
-projects[wetkit_deployment][version] = 1.7
+projects[wetkit_deployment][version] = 1.9
 projects[wetkit_deployment][subdir] = custom
 
 projects[wetkit_images][version] = 1.5
 projects[wetkit_images][subdir] = custom
 
-projects[wetkit_language][version] = 1.8
+projects[wetkit_language][version] = 1.9
 projects[wetkit_language][subdir] = custom
 
-projects[wetkit_layouts][version] = 1.2
+projects[wetkit_layouts][version] = 1.3
 projects[wetkit_layouts][subdir] = custom
 
-projects[wetkit_menu][version] = 1.4
+projects[wetkit_menu][version] = 1.5
 projects[wetkit_menu][subdir] = custom
 
-projects[wetkit_metatag][version] = 1.5
+projects[wetkit_metatag][version] = 1.6
 projects[wetkit_metatag][subdir] = custom
 
 projects[wetkit_migrate][version] = 1.6
@@ -45,30 +45,30 @@ projects[wetkit_og][subdir] = custom
 projects[wetkit_pages][version] = 1.4
 projects[wetkit_pages][subdir] = custom
 
-projects[wetkit_search][version] = 1.6
+projects[wetkit_search][version] = 1.7
 projects[wetkit_search][subdir] = custom
 
-projects[wetkit_theme][version] = 1.2
+projects[wetkit_theme][version] = 1.3
 projects[wetkit_theme][subdir] = custom
 
 projects[wetkit_users][version] = 1.2
 projects[wetkit_users][subdir] = custom
 
-projects[wetkit_wetboew][version] = 1.4
+projects[wetkit_wetboew][version] = 1.5
 projects[wetkit_wetboew][subdir] = custom
 
-projects[wetkit_widgets][version] = 1.7
+projects[wetkit_widgets][version] = 1.8
 projects[wetkit_widgets][subdir] = custom
 
-projects[wetkit_wysiwyg][version] = 1.5
+projects[wetkit_wysiwyg][version] = 1.6
 projects[wetkit_wysiwyg][subdir] = custom
 
 ; WxT Foundation (Themes)
 
-projects[wetkit_ember][version] = 1.7
+projects[wetkit_ember][version] = 1.8
 projects[wetkit_ember][type] = theme
 
-projects[wetkit_omega][version] = 1.9
+projects[wetkit_omega][version] = 1.10
 projects[wetkit_omega][type] = theme
 
 projects[wetkit_shiny][version] = 1.1

drupal-org.make

@@ -3,131 +3,73 @@ core = 7.x
 
 ; WxT Foundation (Custom)
 
-projects[wetkit_admin][version] = 1.x-dev
+projects[wetkit_admin][version] = 1.7
 projects[wetkit_admin][subdir] = custom
-projects[wetkit_admin][download][type] = git
-projects[wetkit_admin][download][revision] = 016e0f6
-projects[wetkit_admin][download][branch] = 7.x-1.x
 
-projects[wetkit_bean][version] = 1.x-dev
+projects[wetkit_bean][version] = 1.8
 projects[wetkit_bean][subdir] = custom
-projects[wetkit_bean][download][type] = git
-projects[wetkit_bean][download][revision] = b99e190
-projects[wetkit_bean][download][branch] = 7.x-1.x
 
-projects[wetkit_breadcrumbs][version] = 1.x-dev
+projects[wetkit_breadcrumbs][version] = 1.6
 projects[wetkit_breadcrumbs][subdir] = custom
-projects[wetkit_breadcrumbs][download][type] = git
-projects[wetkit_breadcrumbs][download][revision] = f92ebaa
-projects[wetkit_breadcrumbs][download][branch] = 7.x-1.x
 
-projects[wetkit_core][version] = 1.x-dev
+projects[wetkit_core][version] = 1.16
 projects[wetkit_core][subdir] = custom
-projects[wetkit_core][download][type] = git
-projects[wetkit_core][download][revision] = 22f5565
-projects[wetkit_core][download][branch] = 7.x-1.x
 
-projects[wetkit_demo][version] = 1.x-dev
+projects[wetkit_demo][version] = 1.1
 projects[wetkit_demo][subdir] = custom
-projects[wetkit_demo][download][type] = git
-projects[wetkit_demo][download][branch] = 7.x-1.x
 
-projects[wetkit_deployment][version] = 1.x-dev
+projects[wetkit_deployment][version] = 1.9
 projects[wetkit_deployment][subdir] = custom
-projects[wetkit_deployment][download][type] = git
-projects[wetkit_deployment][download][revision] = 4b163d3
-projects[wetkit_deployment][download][branch] = 7.x-1.x
 
-projects[wetkit_images][version] = 1.x-dev
+projects[wetkit_images][version] = 1.5
 projects[wetkit_images][subdir] = custom
-projects[wetkit_images][download][type] = git
-projects[wetkit_images][download][branch] = 7.x-1.x
 
-projects[wetkit_language][version] = 1.x-dev
+projects[wetkit_language][version] = 1.9
 projects[wetkit_language][subdir] = custom
-projects[wetkit_language][download][type] = git
-projects[wetkit_language][download][revision] = 2c086df
-projects[wetkit_language][download][branch] = 7.x-1.x
 
-projects[wetkit_layouts][version] = 1.x-dev
+projects[wetkit_layouts][version] = 1.3
 projects[wetkit_layouts][subdir] = custom
-projects[wetkit_layouts][download][type] = git
-projects[wetkit_layouts][download][revision] = 257d854
-projects[wetkit_layouts][download][branch] = 7.x-1.x
 
-projects[wetkit_menu][version] = 1.x-dev
+projects[wetkit_menu][version] = 1.5
 projects[wetkit_menu][subdir] = custom
-projects[wetkit_menu][download][type] = git
-projects[wetkit_menu][download][revision] = 5e1ec25
-projects[wetkit_menu][download][branch] = 7.x-1.x
 
-projects[wetkit_metatag][version] = 1.x-dev
+projects[wetkit_metatag][version] = 1.6
 projects[wetkit_metatag][subdir] = custom
-projects[wetkit_metatag][download][type] = git
-projects[wetkit_metatag][download][revision] = 1f69d1e
-projects[wetkit_metatag][download][branch] = 7.x-1.x
 
-projects[wetkit_migrate][version] = 1.x-dev
+projects[wetkit_migrate][version] = 1.6
 projects[wetkit_migrate][subdir] = custom
-projects[wetkit_migrate][download][type] = git
-projects[wetkit_migrate][download][branch] = 7.x-1.x
 
-projects[wetkit_og][version] = 1.x-dev
+projects[wetkit_og][version] = 1.2
 projects[wetkit_og][subdir] = custom
-projects[wetkit_og][download][type] = git
-projects[wetkit_og][download][branch] = 7.x-1.x
 
-projects[wetkit_pages][version] = 1.x-dev
+projects[wetkit_pages][version] = 1.4
 projects[wetkit_pages][subdir] = custom
-projects[wetkit_pages][download][type] = git
-projects[wetkit_pages][download][branch] = 7.x-1.x
 
-projects[wetkit_search][version] = 1.x-dev
+projects[wetkit_search][version] = 1.7
 projects[wetkit_search][subdir] = custom
-projects[wetkit_search][download][type] = git
-projects[wetkit_search][download][revision] = 884531d
-projects[wetkit_search][download][branch] = 7.x-1.x
 
-projects[wetkit_theme][version] = 1.x-dev
+projects[wetkit_theme][version] = 1.3
 projects[wetkit_theme][subdir] = custom
-projects[wetkit_theme][download][type] = git
-projects[wetkit_theme][download][revision] = b82b613
-projects[wetkit_theme][download][branch] = 7.x-1.x
 
-projects[wetkit_users][version] = 1.x-dev
+projects[wetkit_users][version] = 1.2
 projects[wetkit_users][subdir] = custom
-projects[wetkit_users][download][type] = git
-projects[wetkit_users][download][branch] = 7.x-1.x
 
-projects[wetkit_wetboew][version] = 1.x-dev
+projects[wetkit_wetboew][version] = 1.5
 projects[wetkit_wetboew][subdir] = custom
-projects[wetkit_wetboew][download][type] = git
-projects[wetkit_wetboew][download][revision] = 044b78e
-projects[wetkit_wetboew][download][branch] = 7.x-1.x
 
-projects[wetkit_widgets][version] = 1.x-dev
+projects[wetkit_widgets][version] = 1.8
 projects[wetkit_widgets][subdir] = custom
-projects[wetkit_widgets][download][type] = git
-projects[wetkit_widgets][download][revision] = 182a8fe
-projects[wetkit_widgets][download][branch] = 7.x-1.x
 
-projects[wetkit_wysiwyg][version] = 1.x-dev
+projects[wetkit_wysiwyg][version] = 1.6
 projects[wetkit_wysiwyg][subdir] = custom
-projects[wetkit_wysiwyg][download][type] = git
-projects[wetkit_wysiwyg][download][revision] = e6845c9
-projects[wetkit_wysiwyg][download][branch] = 7.x-1.x
 
 ; WxT Foundation (Themes)
 
-projects[wetkit_ember][version] = 1.x-dev
-projects[wetkit_ember][download][type] = git
-projects[wetkit_ember][download][branch] = 7.x-1.x
+projects[wetkit_ember][version] = 1.8
+projects[wetkit_ember][type] = theme
 
-projects[wetkit_omega][version] = 1.x-dev
-projects[wetkit_omega][download][type] = git
-projects[wetkit_omega][download][revision] = 0487bc0
-projects[wetkit_omega][download][branch] = 7.x-1.x
+projects[wetkit_omega][version] = 1.10
+projects[wetkit_omega][type] = theme
 
-projects[wetkit_shiny][version] = 1.x-dev
-projects[wetkit_shiny][download][type] = git
-projects[wetkit_shiny][download][branch] = 7.x-1.x
+projects[wetkit_shiny][version] = 1.1
+projects[wetkit_shiny][type] = theme