diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 96907ab337a7..8cb6c2d6c798 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2191,7 +2191,7 @@ private function _getTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) : false; // Wrap MIME-transformations. [MIME] - $default_function = 'PMA_mimeDefaultFunction'; // default_function + $default_function = '_mimeDefaultFunction'; // default_function $transformation_plugin = $default_function; $transform_options = array(); @@ -2928,7 +2928,7 @@ private function _getDataCellForBlobColumns( $transform_options, $meta ) - : $default_function($column, array(), $meta); + : $this->$default_function($column, array(), $meta); if ($is_field_truncated) { $class .= ' truncated'; @@ -4068,7 +4068,7 @@ private function _getSortedColumnMessage( $row = PMA_DBI_fetch_row($dt_result); // initializing default arguments - $default_function = 'PMA_mimeDefaultFunction'; + $default_function = '_mimeDefaultFunction'; $transformation_plugin = $default_function; $transform_options = array(); @@ -4596,7 +4596,7 @@ private function _handleNonPrintableContents( ); } else { - $result = $default_function($result, array(), $meta); + $result = $this->$default_function($result, array(), $meta); if (stristr($meta->type, self::BLOB_FIELD) && $_SESSION['tmp_user_values']['display_blob'] ) { @@ -4726,7 +4726,7 @@ private function _getRowData( $transform_options, $meta ) - : $default_function($data) + : $this->$default_function($data) ) . ' [->' . $dispval . ']'; @@ -4776,10 +4776,10 @@ private function _getRowData( if ($_SESSION['tmp_user_values']['relational_display'] == self::RELATIONAL_DISPLAY_COLUMN) { // user chose "relational display field" in the // display options, so show display field in the cell - $result .= $default_function($dispval); + $result .= $this->$default_function($dispval); } else { // otherwise display data in the cell - $result .= $default_function($data); + $result .= $this->$default_function($data); } } @@ -4793,7 +4793,7 @@ private function _getRowData( $transform_options, $meta ) - : $default_function($data) + : $this->$default_function($data) ); } @@ -5087,6 +5087,32 @@ private function _getCheckboxAndLinks( return $ret; } // end of the '_getCheckboxAndLinks()' function + + + /** + * Replace some html-unfriendly stuff + * + * @param string $buffer String to process + * + * @return Escaped and cleaned up text suitable for html. + * + * @access private + * + * @see _getDataCellForBlobField(), _getRowData(), + * _handleNonPrintableContents() + */ + private function _mimeDefaultFunction($buffer) + { + $buffer = htmlspecialchars($buffer); + $buffer = str_replace( + "\011", + '    ', + str_replace(' ', '  ', $buffer) + ); + $buffer = preg_replace("@((\015\012)|(\015)|(\012))@", '
', $buffer); + + return $buffer; + } } ?> diff --git a/libraries/core.lib.php b/libraries/core.lib.php index af0792703f74..66ea8b521162 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -777,31 +777,4 @@ function PMA_addJSVar($key, $value, $escape = true) PMA_addJSCode(PMA_getJsValue($key, $value, $escape)); } - -/** - * Replace some html-unfriendly stuff - * - * @param string $buffer String to process - * - * @return Escaped and cleaned up text suitable for html. - * - * @access private - * - * @see PMA_DisplayResults::_getDataCellForBlobField(), - * PMA_DisplayResults::_getRowData(), - * PMA_DisplayResults::_handleNonPrintableContents() - */ -function PMA_mimeDefaultFunction($buffer) -{ - $buffer = htmlspecialchars($buffer); - $buffer = str_replace( - "\011", - '    ', - str_replace(' ', '  ', $buffer) - ); - $buffer = preg_replace("@((\015\012)|(\015)|(\012))@", '
', $buffer); - - return $buffer; -} - ?>