diff -u b/core/modules/system/system.install b/core/modules/system/system.install --- b/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -1976,6 +1976,19 @@ } /** + * Moves image toolkit settings from variable to config. + * + * @ingroup config_upgrade + */ +function system_update_8022() { + update_variables_to_config('system.image', array( + 'image_toolkit' => 'toolkit', + )); + update_variables_to_config('system.image.gd', array( + 'image_jpeg_quality' => 'jpeg_quality', + )); +} +/** * @} End of "defgroup updates-7.x-to-8.x". * The next series of updates should start at 9000. */ @@ -1989,19 +2002,6 @@ } /** - * Moves image toolkit settings from variable to config. - * - * @ingroup config_upgrade - */ -function system_update_8021() { - update_variables_to_config('system.image', array( - 'image_toolkit' => 'toolkit', - )); - update_variables_to_config('system.image.gd', array( - 'image_jpeg_quality' => 'jpeg_quality', - )); -} -/** * @} End of "defgroup updates-7.x-to-8.x". * The next series of updates should start at 9000. */ diff -u b/core/modules/system/system.module b/core/modules/system/system.module --- b/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -3520,19 +3520,6 @@ } /** - * Implements hook_image_toolkits(). - */ -function system_image_toolkits() { - include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'system') . '/' . 'image.gd.inc'; - return array( - 'gd' => array( - 'title' => t('GD2 image manipulation toolkit'), - 'available' => function_exists('image_gd_check_settings') && image_gd_check_settings(), - ), - ); -} - -/** * Attempts to get a file using drupal_http_request and to store it locally. * * @param $url @@ -3796,6 +3783,19 @@ } /** + * Implements hook_image_toolkits(). + */ +function system_image_toolkits() { + include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'system') . '/' . 'image.gd.inc'; + return array( + 'gd' => array( + 'title' => t('GD2 image manipulation toolkit'), + 'available' => function_exists('image_gd_check_settings') && image_gd_check_settings(), + ), + ); +} + +/** * Attempts to get a file using drupal_http_request and to store it locally. * * @param $url