libraries/common.lib.php might have not been loaded by the time PMA_isSerializable() is called.

This commit is contained in:
Madhura Jayaratne
2012-02-19 21:22:36 +05:30
parent f9b2f08f21
commit 6cec91e805
2 changed files with 5 additions and 18 deletions

View File

@@ -169,7 +169,11 @@ class PMA_Error extends PMA_Message
*/
public function getHash()
{
$backtrace = PMA_isSerializable($this->getBacktrace()) ? serialize($this->getBacktrace()) : '';
try {
$backtrace = serialize($this->getBacktrace());
} catch(Exception $e){
$backtrace = '';
}
if (null === $this->_hash) {
$this->_hash = md5(
$this->getNumber() .

View File

@@ -3022,21 +3022,4 @@ function PMA_buildActionTitles() {
$titles['Edit'] = PMA_getIcon('b_edit.png', __('Edit'), true);
return $titles;
}
/**
* Determines whether a variable is serializable.
*
* @param object $var object which needs to be checked for serializability
*
* @return whether the object is serializable.
*/
function PMA_isSerializable($var)
{
try {
serialize($var);
return true;
} catch(Exception $e) {
return false;
}
}
?>