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

drupal core updated to 7.28

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2014-07-07 18:53:44 +02:00
parent 10de06dd70
commit c3011cef61
263 changed files with 3331 additions and 8894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/system/system.admin.inc
View File

@@ -309,7 +309,7 @@ function system_theme_enable() {
}
drupal_goto('admin/appearance');
}
return drupal_access_denied();
return MENU_ACCESS_DENIED;
}
/**
@@ -337,7 +337,7 @@ function system_theme_disable() {
}
drupal_goto('admin/appearance');
}
return drupal_access_denied();
return MENU_ACCESS_DENIED;
}
/**
@@ -383,7 +383,7 @@ function system_theme_default() {
}
drupal_goto('admin/appearance');
}
return drupal_access_denied();
return MENU_ACCESS_DENIED;
}
/**
@@ -995,22 +995,28 @@ function _system_modules_build_row($info, $extra) {
$status_short = '';
$status_long = '';
// Initialize empty arrays of long and short reasons explaining why the
// module is incompatible.
// Add each reason as a separate element in both the arrays.
$reasons_short = array();
$reasons_long = array();
// Check the core compatibility.
if (!isset($info['core']) || $info['core'] != DRUPAL_CORE_COMPATIBILITY) {
$compatible = FALSE;
$status_short .= t('Incompatible with this version of Drupal core.');
$status_long .= t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => DRUPAL_CORE_COMPATIBILITY));
$reasons_short[] = t('Incompatible with this version of Drupal core.');
$reasons_long[] = t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => DRUPAL_CORE_COMPATIBILITY));
}
// Ensure this module is compatible with the currently installed version of PHP.
if (version_compare(phpversion(), $info['php']) < 0) {
$compatible = FALSE;
$status_short .= t('Incompatible with this version of PHP');
$reasons_short[] = t('Incompatible with this version of PHP');
$php_required = $info['php'];
if (substr_count($info['php'], '.') < 2) {
$php_required .= '.*';
}
$status_long .= t('This module requires PHP version @php_required and is incompatible with PHP version !php_version.', array('@php_required' => $php_required, '!php_version' => phpversion()));
$reasons_long[] = t('This module requires PHP version @php_required and is incompatible with PHP version !php_version.', array('@php_required' => $php_required, '!php_version' => phpversion()));
}
// If this module is compatible, present a checkbox indicating
@@ -1026,6 +1032,8 @@ function _system_modules_build_row($info, $extra) {
}
}
else {
$status_short = implode(' ', $reasons_short);
$status_long = implode(' ', $reasons_long);
$form['enable'] = array(
'#markup' => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => $status_short, 'title' => $status_short)),
);
@@ -1618,6 +1626,7 @@ function system_cron_settings() {
$form['cron']['cron_safe_threshold'] = array(
'#type' => 'select',
'#title' => t('Run cron every'),
'#description' => t('More information about setting up scheduled tasks can be found by <a href="@url">reading the cron tutorial on drupal.org</a>.', array('@url' => url('http://drupal.org/cron'))),
'#default_value' => variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD),
'#options' => array(0 => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 43200, 86400, 604800), 'format_interval'),
);
@@ -2575,7 +2584,7 @@ function theme_status_report($variables) {
foreach ($requirements as $requirement) {
if (empty($requirement['#type'])) {
$severity = $severities[isset($requirement['severity']) ? (int) $requirement['severity'] : 0];
$severity = $severities[isset($requirement['severity']) ? (int) $requirement['severity'] : REQUIREMENT_OK];
$severity['icon'] = '<div title="' . $severity['title'] . '"><span class="element-invisible">' . $severity['title'] . '</span></div>';
// Output table row(s)