diff --git a/ChangeLog b/ChangeLog
index 9e868eb49..557772737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,7 @@ $Id$
+ patch #2984337 [interface] Convert loading of export/import to jQuery ready
event, thanks to sutharshan.
- [edit] CURRENT_TIMESTAMP is also valid for datetime fields.
+- patch #2985068 [engines] Fix parsing of PBXT status, thanks to Madhura Jayaratne.
3.3.3.0 (not yet released)
- patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
index d03f40abb..af0da1a92 100644
--- a/libraries/StorageEngine.class.php
+++ b/libraries/StorageEngine.class.php
@@ -178,7 +178,7 @@ class PMA_StorageEngine
. '
';
switch ($details['type']) {
case PMA_ENGINE_DETAILS_TYPE_SIZE:
- $parsed_size = PMA_formatByteDown($details['value']);
+ $parsed_size = $this->resolveTypeSize($details['value']);
$ret .= $parsed_size[0] . ' ' . $parsed_size[1];
unset($parsed_size);
break;
@@ -204,6 +204,21 @@ class PMA_StorageEngine
return $ret;
}
+ /**
+ * returns the engine specific handling for
+ * PMA_ENGINE_DETAILS_TYPE_SIZE type variables.
+ *
+ * This function should be overridden when
+ * PMA_ENGINE_DETAILS_TYPE_SIZE type needs to be
+ * handled differently for a particular engine.
+ *
+ * @return string the formatted value and its unit
+ */
+ function resolveTypeSize($value)
+ {
+ return PMA_formatByteDown($value);
+ }
+
/**
* returns array with detailed info about engine specific server variables
*
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 97e7f8590..fea68406a 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1271,7 +1271,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
PMA_profilingCheckbox($sql_query);
}
$inline_edit = " |