Commit 85cae0d0 authored by Gábor Hojtsy's avatar Gábor Hojtsy
Browse files

#204411 by chx, slightly modified: heal a possible MySQL import error when the...

#204411 by chx, slightly modified: heal a possible MySQL import error when the anonymous user becomes broken
parent a94ef1d6
......@@ -542,7 +542,7 @@ function comment_form_alter(&$form, $form_state, $form_id) {
COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information')),
'#description' => t('This option is enabled when anonymous users have permission to post comments on the <a href="@url">permissions page</a>.', array('@url' => url('admin/user/permissions', array('fragment' => 'module-comment')))),
);
if (!user_access('post comments', user_load(array('uid' => 0)))) {
if (!user_access('post comments', drupal_anonymous_user())) {
$form['comment']['comment_anonymous']['#disabled'] = TRUE;
}
$form['comment']['comment_subject_field'] = array(
......
......@@ -582,7 +582,7 @@ function _system_is_incompatible(&$incompatible, $files, $file) {
}
// The 'dependencies' key in .info files was a string in Drupal 5, but changed
// to an array in Drupal 6. If it is not an array, the module is not
// compatible and we can skip the check below which requires an array.
// compatible and we can skip the check below which requires an array.
if (!is_array($file->info['dependencies'])) {
$file->info['dependencies'] = array();
$incompatible[$file->name] = TRUE;
......@@ -1686,7 +1686,6 @@ function system_clean_url_settings() {
* Menu callback: displays the site status report. Can also be used as a pure check.
*
* @param $check
*
* If true, only returns a boolean whether there are system status errors.
*/
function system_status($check = FALSE) {
......@@ -1694,13 +1693,16 @@ function system_status($check = FALSE) {
include_once './includes/install.inc';
drupal_load_updates();
// Check run-time requirements and status information
// Check run-time requirements and status information.
$requirements = module_invoke_all('requirements', 'runtime');
usort($requirements, '_system_sort_requirements');
if ($check) {
return drupal_requirements_severity($requirements) == REQUIREMENT_ERROR;
}
// MySQL import might have set the uid of the anonymous user to autoincrement
// value. Let's try fixing it. See http://drupal.org/node/204411
db_query("UPDATE {users} SET uid = uid - uid WHERE name = '' AND pass = '' AND status = 0");
return theme('status_report', $requirements);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment