diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2016-02-02 16:09:40 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2016-02-02 16:09:40 +0100 |
| commit | 91f809dc3dc926ff858e5e53ee8cfed781c1aeaa (patch) | |
| tree | f87d12c1bbfbd6d4e9ab5d746485852365476bd9 /phpBB | |
| parent | a3f16c1f5fa7c22687840f7760fdc40a36c6d545 (diff) | |
| download | forums-91f809dc3dc926ff858e5e53ee8cfed781c1aeaa.tar forums-91f809dc3dc926ff858e5e53ee8cfed781c1aeaa.tar.gz forums-91f809dc3dc926ff858e5e53ee8cfed781c1aeaa.tar.bz2 forums-91f809dc3dc926ff858e5e53ee8cfed781c1aeaa.tar.xz forums-91f809dc3dc926ff858e5e53ee8cfed781c1aeaa.zip | |
[ticket/14262] Add error handling and small CS fixes
PHPBB3-14262
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/installer_convert.html | 8 | ||||
| -rw-r--r-- | phpBB/install/convert/convert.php | 4 | ||||
| -rw-r--r-- | phpBB/install/convert/convertor.php | 14 |
3 files changed, 18 insertions, 8 deletions
diff --git a/phpBB/adm/style/installer_convert.html b/phpBB/adm/style/installer_convert.html index 8f1c51a1cb..aa16542b6b 100644 --- a/phpBB/adm/style/installer_convert.html +++ b/phpBB/adm/style/installer_convert.html @@ -6,6 +6,14 @@ <p>{ERROR_MSG}</p> </div> <!-- ENDIF --> +<!-- IF .errors --> +<div id="error-container"> +<!-- BEGIN errors --> + <strong>{errors.TITLE}</strong> + <!-- IF errors.DESCRIPTION --><p>{errors.DESCRIPTION}</p><!-- ENDIF --> +<!-- END errors --> +</div> +<!-- ENDIF --> <!-- IF BODY --><p>{BODY}</p><!-- ENDIF --> <!-- IF CONTENT -->{CONTENT}<!-- ENDIF --> <!-- IF S_CONV_IN_PROGRESS --> diff --git a/phpBB/install/convert/convert.php b/phpBB/install/convert/convert.php index d12059fe29..03913d6ae6 100644 --- a/phpBB/install/convert/convert.php +++ b/phpBB/install/convert/convert.php @@ -53,8 +53,8 @@ class convert var $p_master; - function convert(&$p_master) + function convert($p_master) { - $this->p_master = &$p_master; + $this->p_master = $p_master; } } diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php index 8dbc38f303..2dae356c26 100644 --- a/phpBB/install/convert/convertor.php +++ b/phpBB/install/convert/convertor.php @@ -1591,9 +1591,10 @@ class convertor */ public function error($error, $line, $file, $skip = false) { - // - // @todo - // + $this->template->assign_block_vars('errors', array( + 'TITLE' => $error, + 'DESCRIPTION' => 'In ' . $file . ' on line ' . $line, + )); } /** @@ -1609,8 +1610,9 @@ class convertor */ public function db_error($error, $sql, $line, $file, $skip = false) { - // - // @todo - // + $this->template->assign_block_vars('errors', array( + 'TITLE' => $error, + 'DESCRIPTION' => 'In ' . $file . ' on line ' . $line . '<br /><br /><strong>SQL:</strong> ' . $sql, + )); } } |