Commit 9410c75a authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'F5450-mysql-exception-code-highlighting' into 'master'

F5450 - MySQL Exception: underline faulty area - #refs 5450

See merge request !100
parents f3a12e6f 14136c87
Pipeline #1019 passed with stage
in 1 minute and 36 seconds
......@@ -129,8 +129,22 @@ class AbstractException extends \Exception {
$editForm = $this->buildFormLink($storeSystem);
}
$arrMerged = OnArray::htmlentitiesOnArray(array_merge($arrMsg, $arrDebugShow));
if (!empty($os = $arrMerged[ERROR_MESSAGE_OS])) {
$beforeMatch = htmlentities("the right syntax to use near '", ENT_QUOTES);
$afterMatch = htmlentities("' at line [0-9]*$", ENT_QUOTES);
if(preg_match("/mysqli: 1064.*$beforeMatch.*$afterMatch/", $os)) {
$match = explode("$beforeMatch", $os, 2)[1];
$match = preg_split("/$afterMatch/", $match)[0];
$splitSql = explode($match, $arrMerged[EXCEPTION_SQL_FINAL]);
$match = Support::wrapTag('<span class="qfq-wavy-underline">', $match);
$highlightedSql = implode($match, $splitSql);
$arrMerged[EXCEPTION_SQL_FINAL] = $highlightedSql;
}
}
$htmlDebug = OnArray::arrayToHtmlTable(
array_merge(OnArray::htmlentitiesOnArray(array_merge($arrMsg, $arrDebugShow)), [ 'Edit' => $editForm ]), 'Debug', EXCEPTION_TABLE_CLASS);
array_merge($arrMerged, [ 'Edit' => $editForm ]), 'Debug', EXCEPTION_TABLE_CLASS);
$htmlDebug = str_replace("\n", "<br>", $htmlDebug);
$arrDebugHiddenClean = OnArray::htmlentitiesOnArray($arrDebugHidden);
......
......@@ -737,4 +737,8 @@ select.qfq-locked:invalid {
.qfq-droplet-container.qfq-droplet-blue:before {
border-color: transparent #25adf1 #25adf1 transparent;
}
.qfq-wavy-underline {
background: url('../icons/wavy-underline.gif') bottom repeat-x
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment