diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php index e6d3b56aeb03..7abdaf4788a4 100644 --- a/libraries/classes/CentralColumns.php +++ b/libraries/classes/CentralColumns.php @@ -931,11 +931,12 @@ public static function getHtmlForCentralColumnsTableRow(array $row, $row_num, $d . Template::get('columns_definitions/column_default') ->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 3, 'ci_offset' => 0, 'type_upper' => mb_strtoupper($row['col_type']), - 'columnMeta' => $meta + 'column_meta' => $meta, + 'char_editing' => $GLOBALS['cfg']['CharEditing'], ) ) . ''; @@ -1072,11 +1073,12 @@ public static function getHtmlForCentralColumnsEditTableRow(array $row, $row_num . Template::get('columns_definitions/column_default') ->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 3, 'ci_offset' => 0, 'type_upper' => mb_strtoupper($row['col_default']), - 'columnMeta' => $meta + 'column_meta' => $meta, + 'char_editing' => $GLOBALS['cfg']['CharEditing'], ) ) . ''; @@ -1321,11 +1323,12 @@ public static function getHtmlForAddNewColumn($db, $total_rows) . Template::get('columns_definitions/column_default') ->render( array( - 'columnNumber' => 0, + 'column_number' => 0, 'ci' => 3, 'ci_offset' => 0, 'type_upper' => '', - 'columnMeta' => array() + 'column_meta' => array(), + 'char_editing' => $GLOBALS['cfg']['CharEditing'], ) ) . '' diff --git a/libraries/classes/Twig/PhpFunctionsExtension.php b/libraries/classes/Twig/PhpFunctionsExtension.php index 1061edab1a8c..e7dcf3f96747 100644 --- a/libraries/classes/Twig/PhpFunctionsExtension.php +++ b/libraries/classes/Twig/PhpFunctionsExtension.php @@ -26,6 +26,7 @@ public function getFunctions() { return array( new Twig_SimpleFunction('array_search', 'array_search'), + new Twig_SimpleFunction('bin2hex', 'bin2hex'), new Twig_SimpleFunction('md5', 'md5'), new Twig_SimpleFunction('preg_replace', 'preg_replace'), new Twig_SimpleFunction('strpos', 'strpos'), diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml index 68a57cbe23dd..5d22095d2b89 100644 --- a/templates/columns_definitions/column_attributes.phtml +++ b/templates/columns_definitions/column_attributes.phtml @@ -45,11 +45,12 @@ $ci_offset = -1; = PhpMyAdmin\Template::get('columns_definitions/column_default') ->render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, 'type_upper' => isset($type_upper) ? $type_upper : null, - 'columnMeta' => isset($columnMeta) ? $columnMeta : null + 'column_meta' => isset($columnMeta) ? $columnMeta : null, + 'char_editing' => $GLOBALS['cfg']['CharEditing'], )); ?>