makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14262] Add error handling and small CS fixes

Browse source 
PHPBB3-14262
This commit is contained in:
Mate Bartus 2016-02-02 16:09:40 +01:00
parent a3f16c1f5f
commit 91f809dc3d
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/adm/style/installer_convert.html
View file

@ -6,6 +6,14 @@
<p>{ERROR_MSG}</p> <p>{ERROR_MSG}</p>
</div> </div>
<!-- ENDIF --> <!-- 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 BODY --><p>{BODY}</p><!-- ENDIF -->
<!-- IF CONTENT -->{CONTENT}<!-- ENDIF --> <!-- IF CONTENT -->{CONTENT}<!-- ENDIF -->
<!-- IF S_CONV_IN_PROGRESS --> <!-- IF S_CONV_IN_PROGRESS -->

4
phpBB/install/convert/convert.php
View file

@ -53,8 +53,8 @@ class convert
var $p_master; var $p_master;
function convert(&$p_master) function convert($p_master)
{ {
$this->p_master = &$p_master; $this->p_master = $p_master;
} }
} }

14
phpBB/install/convert/convertor.php
View file

@ -1591,9 +1591,10 @@ class convertor
*/ */
public function error($error, $line, $file, $skip = false) public function error($error, $line, $file, $skip = false)
{ {
// $this->template->assign_block_vars('errors', array(
// @todo 'TITLE' => $error,
// 'DESCRIPTION' => 'In ' . $file . ' on line ' . $line,
));
} }
/** /**
@ -1609,8 +1610,9 @@ class convertor
*/ */
public function db_error($error, $sql, $line, $file, $skip = false) public function db_error($error, $sql, $line, $file, $skip = false)
{ {
// $this->template->assign_block_vars('errors', array(
// @todo 'TITLE' => $error,
// 'DESCRIPTION' => 'In ' . $file . ' on line ' . $line . '<br /><br /><strong>SQL:</strong> ' . $sql,
));
} }
} }