Merge "fix php notices"

This commit is contained in:
Hoo man 2012-11-02 19:57:52 +00:00 committed by Gerrit Code Review
commit d2568a7d43
2 changed files with 3 additions and 3 deletions

View file

@ -1663,7 +1663,7 @@ class AbuseFilter {
list( $row2, $actions2 ) = $version_2;
foreach ( $compareFields as $field ) {
if ( $row1->$field != $row2->$field ) {
if ( !isset( $row2->$field ) || $row1->$field != $row2->$field ) {
$differences[] = $field;
}
}

View file

@ -344,7 +344,7 @@ class AbuseFilterViewEdit extends AbuseFilterView {
'default'
);
if ( $row->af_group ) {
if ( isset( $row->af_group ) && $row->af_group ) {
$groupSelector->setDefault($row->af_group);
}
@ -633,7 +633,7 @@ class AbuseFilterViewEdit extends AbuseFilterView {
$warnMsg = $parameters[0];
} elseif (
$row &&
$row->af_group &&
isset( $row->af_group ) && $row->af_group &&
isset($wgAbuseFilterDefaultWarningMessage[$row->af_group] )
) {
$warnMsg = $wgAbuseFilterDefaultWarningMessage[$row->af_group];