Skip to content

Commit

Permalink
Fix use of non-object.
Browse files Browse the repository at this point in the history
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
  • Loading branch information
Tithugues committed Aug 18, 2014
1 parent 0104819 commit 9223382
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions libraries/DisplayResults.class.php
Expand Up @@ -3894,16 +3894,15 @@ private function _getDataCellForNonNumericColumns(
// if binary fields are protected
// or transformation plugin is of non text type
// such as image
$posMimeText = $pmaString
->strpos($transformation_plugin->getMIMEtype(), 'Text');
if ((stristr($field_flags, self::BINARY_FIELD)
&& ($GLOBALS['cfg']['ProtectBinary'] === 'all'
|| ($GLOBALS['cfg']['ProtectBinary'] === 'noblob'
&& !stristr($meta->type, self::BLOB_FIELD))
|| ($GLOBALS['cfg']['ProtectBinary'] === 'blob'
&& stristr($meta->type, self::BLOB_FIELD))))
|| (gettype($transformation_plugin) === 'object'
&& $posMimeText === false)
&& $pmaString->strpos($transformation_plugin->getMIMEtype(), 'Text')
=== false)
) {
$class = str_replace('grid_edit', '', $class);
}
Expand Down

0 comments on commit 9223382

Please sign in to comment.