mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
- some bugfixes
- using E_USER_WARNING if an error occurred within the ACP (sadly not able to use it as a default for trigger_error - it seems to be hardcoded in PHP) git-svn-id: file:///svn/phpbb/trunk@6320 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -152,7 +152,7 @@ class acp_search
|
||||
}
|
||||
else
|
||||
{
|
||||
trigger_error($error);
|
||||
trigger_error($error, E_USER_WARNING);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -168,7 +168,7 @@ class acp_search
|
||||
}
|
||||
else
|
||||
{
|
||||
trigger_error($error);
|
||||
trigger_error($error, E_USER_WARNING);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -228,7 +228,8 @@ class acp_search
|
||||
break;
|
||||
|
||||
default:
|
||||
trigger_error('NO_ACTION');
|
||||
trigger_error('NO_ACTION', E_USER_ERROR);
|
||||
break;
|
||||
}
|
||||
|
||||
if (empty($this->state[0]))
|
||||
@@ -240,7 +241,7 @@ class acp_search
|
||||
$error = false;
|
||||
if ($this->init_search($this->state[0], $this->search, $error))
|
||||
{
|
||||
trigger_error($error);
|
||||
trigger_error($error, E_USER_WARNING);
|
||||
}
|
||||
|
||||
$action = &$this->state[1];
|
||||
@@ -262,7 +263,7 @@ class acp_search
|
||||
{
|
||||
$this->state = array('');
|
||||
$this->save_state();
|
||||
trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js());
|
||||
trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js(), E_USER_WARNING);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -314,7 +315,7 @@ class acp_search
|
||||
{
|
||||
$this->state = array('');
|
||||
$this->save_state();
|
||||
trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js());
|
||||
trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js(), E_USER_WARNING);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user