bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated drupal core to 7.51

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2016-11-01 18:21:48 +01:00
parent 2ed8b48636
commit 1f780c974e
227 changed files with 2960 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/update/tests/aaa_update_test.info
View File

@@ -4,8 +4,8 @@ package = Testing
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2016-02-24
version = "7.43"
; Information added by Drupal.org packaging script on 2016-10-05
version = "7.51"
project = "drupal"
datestamp = "1456343506"
datestamp = "1475694174"

6
modules/update/tests/bbb_update_test.info
View File

@@ -4,8 +4,8 @@ package = Testing
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2016-02-24
version = "7.43"
; Information added by Drupal.org packaging script on 2016-10-05
version = "7.51"
project = "drupal"
datestamp = "1456343506"
datestamp = "1475694174"

6
modules/update/tests/ccc_update_test.info
View File

@@ -4,8 +4,8 @@ package = Testing
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2016-02-24
version = "7.43"
; Information added by Drupal.org packaging script on 2016-10-05
version = "7.51"
project = "drupal"
datestamp = "1456343506"
datestamp = "1475694174"

10
modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info Normal file
View File

@@ -0,0 +1,10 @@
name = Update test admin theme
description = Test theme which is used as admin theme.
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2016-10-05
version = "7.51"
project = "drupal"
datestamp = "1475694174"

6
modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
View File

@@ -3,8 +3,8 @@ description = Test theme which acts as a base theme for other test subthemes.
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2016-02-24
version = "7.43"
; Information added by Drupal.org packaging script on 2016-10-05
version = "7.51"
project = "drupal"
datestamp = "1456343506"
datestamp = "1475694174"

6
modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
View File

@@ -4,8 +4,8 @@ core = 7.x
base theme = update_test_basetheme
hidden = TRUE
; Information added by Drupal.org packaging script on 2016-02-24
version = "7.43"
; Information added by Drupal.org packaging script on 2016-10-05
version = "7.51"
project = "drupal"
datestamp = "1456343506"
datestamp = "1475694174"

6
modules/update/tests/update_test.info
View File

@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2016-02-24
version = "7.43"
; Information added by Drupal.org packaging script on 2016-10-05
version = "7.51"
project = "drupal"
datestamp = "1456343506"
datestamp = "1475694174"

1
modules/update/tests/update_test.module
View File

@@ -11,6 +11,7 @@
function update_test_system_theme_info() {
$themes['update_test_basetheme'] = drupal_get_path('module', 'update_test') . '/themes/update_test_basetheme/update_test_basetheme.info';
$themes['update_test_subtheme'] = drupal_get_path('module', 'update_test') . '/themes/update_test_subtheme/update_test_subtheme.info';
$themes['update_test_admintheme'] = drupal_get_path('module', 'update_test') . '/themes/update_test_admintheme/update_test_admintheme.info';
return $themes;
}

6
modules/update/update.compare.inc
View File

@@ -104,7 +104,13 @@ function update_get_projects() {
* @see update_get_projects()
*/
function _update_process_info_list(&$projects, $list, $project_type, $status) {
$admin_theme = variable_get('admin_theme', 'seven');
foreach ($list as $file) {
// The admin theme is a special case. It should always be considered enabled
// for the purposes of update checking.
if ($file->name === $admin_theme) {
$file->status = TRUE;
}
// A disabled base theme of an enabled sub-theme still has all of its code
// run by the sub-theme, so we include it in our "enabled" projects list.
if ($status && !$file->status && !empty($file->sub_themes)) {

6
modules/update/update.info
View File

@@ -6,8 +6,8 @@ core = 7.x
files[] = update.test
configure = admin/reports/updates/settings
; Information added by Drupal.org packaging script on 2016-02-24
version = "7.43"
; Information added by Drupal.org packaging script on 2016-10-05
version = "7.51"
project = "drupal"
datestamp = "1456343506"
datestamp = "1475694174"

2
modules/update/update.manager.inc
View File

@@ -59,7 +59,7 @@
* @see update_menu()
* @ingroup forms
*/
function update_manager_update_form($form, $form_state = array(), $context) {
function update_manager_update_form($form, $form_state, $context) {
if (!_update_manager_check_backends($form, 'update')) {
return $form;
}

11
modules/update/update.settings.inc
View File

@@ -26,7 +26,7 @@ function update_settings($form) {
$form['update_check_disabled'] = array(
'#type' => 'checkbox',
'#title' => t('Check for updates of disabled modules and themes'),
'#title' => t('Check for updates of disabled and uninstalled modules and themes'),
'#default_value' => variable_get('update_check_disabled', FALSE),
);
@@ -98,10 +98,11 @@ function update_settings_validate($form, &$form_state) {
* Form submission handler for update_settings().
*
* Also invalidates the cache of available updates if the "Check for updates of
* disabled modules and themes" setting is being changed. The available updates
* report needs to refetch available update data after this setting changes or
* it would show misleading things (e.g., listing the disabled projects on the
* site with the "No available releases found" warning).
* disabled and uninstalled modules and themes" setting is being changed. The
* available updates report needs to refetch available update data after this
* setting changes or it would show misleading things (e.g., listing the
* disabled projects on the site with the "No available releases found"
* warning).
*
* @see update_settings_validate()
*/

51
modules/update/update.test
View File

@@ -462,6 +462,55 @@ class UpdateTestContribCase extends UpdateTestHelper {
$this->assertRaw(l(t('Update test base theme'), 'http://example.com/project/update_test_basetheme'), 'Link to the Update test base theme project appears.');
}
/**
* Tests that the admin theme is always notified about security updates.
*/
function testUpdateAdminThemeSecurityUpdate() {
// Disable the admin theme.
db_update('system')
->fields(array('status' => 0))
->condition('type', 'theme')
->condition('name', 'update_test_%', 'LIKE')
->execute();
variable_set('admin_theme', 'update_test_admintheme');
// Define the initial state for core and the themes.
$system_info = array(
'#all' => array(
'version' => '7.0',
),
'update_test_admintheme' => array(
'project' => 'update_test_admintheme',
'version' => '7.x-1.0',
'hidden' => FALSE,
),
'update_test_basetheme' => array(
'project' => 'update_test_basetheme',
'version' => '7.x-1.1',
'hidden' => FALSE,
),
'update_test_subtheme' => array(
'project' => 'update_test_subtheme',
'version' => '7.x-1.0',
'hidden' => FALSE,
),
);
variable_set('update_test_system_info', $system_info);
variable_set('update_check_disabled', FALSE);
$xml_mapping = array(
// This is enough because we don't check the update status of the admin
// theme. We want to check that the admin theme is included in the list.
'drupal' => '0',
);
$this->refreshUpdateStatus($xml_mapping);
// The admin theme is displayed even if it's disabled.
$this->assertText('update_test_admintheme', "The admin theme is checked for update even if it's disabled");
// The other disabled themes are not displayed.
$this->assertNoText('update_test_basetheme', 'Disabled theme is not checked for update in the list.');
$this->assertNoText('update_test_subtheme', 'Disabled theme is not checked for update in the list.');
}
/**
* Tests that disabled themes are only shown when desired.
*/
@@ -800,4 +849,4 @@ class UpdateCoreUnitTestCase extends DrupalUnitTestCase {
$this->assertEqual($url, $expected, "When ? is present, '$url' should be '$expected'.");
}
}
}