diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index c4eb12fea0d2..427987e2f2c4 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2506,7 +2506,7 @@ private function _getVerticalDisplaySupportSegments( * * @return array 5 element array - $edit_url, $copy_url, * $edit_str, $copy_str, $edit_anchor_class - * + * * @access private * * @see _getTableBody() @@ -2558,7 +2558,7 @@ private function _getModifiedLinks( * * @return array 4 element array - $del_query, * $del_url, $del_str, $js_conf - * + * * @access private * * @see _getTableBody() @@ -3069,7 +3069,8 @@ private function _getDataCellForNonNumericAndNonBlobColumns( // (unless it's a link-type transformation) if (PMA_strlen($column) > $GLOBALS['cfg']['LimitChars'] && ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT) - && ! strpos($transformation_plugin, 'Link') === true + && gettype($transformation_plugin) == "object" + && ! strpos($transformation_plugin::getName(), 'Link') === true ) { $column = PMA_substr($column, 0, $GLOBALS['cfg']['LimitChars']) . '...'; @@ -3326,7 +3327,7 @@ private function _getVerticalTable() * @param string $operation edit/copy/delete * * @return string $links_html html content - * + * * @access private * * @see _getVerticalTable() @@ -4508,7 +4509,9 @@ private function _handleNonPrintableContents( $result .= ']'; - if (strpos($transformation_plugin, 'Octetstream')) { + if (gettype($transformation_plugin) == "object" + && strpos($transformation_plugin::getMIMESubtype(), 'Octetstream') + ) { $result = $content; }