diff options
| author | Michal Čihař <mcihar@suse.cz> | 2012-05-09 13:54:39 +0400 |
|---|---|---|
| committer | Michal Čihař <mcihar@suse.cz> | 2012-05-09 13:58:10 +0400 |
| commit | 54dc10a0127e02b744b1d823ce7f2e15244223a3 (patch) | |
| tree | aa97ee665ac8f9851626912be254087e728bfcac /setup | |
| parent | 5961c53cb272bf3c56c326e416ab67d70f8c5218 (diff) | |
Use PMA_fatalError instead of die
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/frames/form.inc.php | 2 | ||||
| -rw-r--r-- | setup/index.php | 2 | ||||
| -rw-r--r-- | setup/lib/common.inc.php | 4 | ||||
| -rw-r--r-- | setup/validate.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index a62b80a297..cf188eb2b0 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -22,7 +22,7 @@ require './libraries/config/setup.forms.php'; $formset_id = filter_input(INPUT_GET, 'formset'); $mode = filter_input(INPUT_GET, 'mode'); if (! isset($forms[$formset_id])) { - die(__('Incorrect formset, check $formsets array in setup/frames/form.inc.php')); + PMA_fatalError(__('Incorrect formset, check $formsets array in setup/frames/form.inc.php')); } if (isset($GLOBALS['strConfigFormset_' . $formset_id])) { diff --git a/setup/index.php b/setup/index.php index 1b202ba842..d828c1ddfd 100644 --- a/setup/index.php +++ b/setup/index.php @@ -19,7 +19,7 @@ if ($page === '') { } if (!file_exists("./setup/frames/$page.inc.php")) { // it will happen only when enterung URL by hand, we don't care for these cases - die(__('Wrong GET file attribute value')); + PMA_fatalError(__('Wrong GET file attribute value')); } // Handle done action info diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php index c547521ac6..38389bee0f 100644 --- a/setup/lib/common.inc.php +++ b/setup/lib/common.inc.php @@ -15,7 +15,7 @@ define('PMA_SETUP', true); chdir('..'); if (!file_exists('./libraries/common.inc.php')) { - die('Bad invocation!'); + PMA_fatalError('Bad invocation!'); } require_once './libraries/common.inc.php'; @@ -52,4 +52,4 @@ ConfigFile::getInstance()->setPersistKeys( // allows for redirection even after sending some data ob_start(); -?>
\ No newline at end of file +?> diff --git a/setup/validate.php b/setup/validate.php index edf562f24d..2cb8c93ca8 100644 --- a/setup/validate.php +++ b/setup/validate.php @@ -19,7 +19,7 @@ header('Content-type: application/json'); $vids = explode(',', filter_input(INPUT_POST, 'id')); $values = json_decode(filter_input(INPUT_POST, 'values')); if (!($values instanceof stdClass)) { - die(__('Wrong data')); + PMA_fatalError(__('Wrong data')); } $values = (array)$values; $result = PMA_config_validate($vids, $values, true); |