diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-28 15:50:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-28 15:50:33 +0000 |
| commit | 1d37b69ddd79d9d6bc1346f3761a899d20305636 (patch) | |
| tree | 7b795bcfea4d119c86b59a7471be36504b4f9c1b /phpBB/includes/acp/acp_search.php | |
| parent | 902285684d08394437650174fa9bdfe6904db85c (diff) | |
| download | forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.gz forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.bz2 forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.xz forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.zip | |
- 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
Diffstat (limited to 'phpBB/includes/acp/acp_search.php')
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index b7c37772ed..b3caae028e 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -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 |