gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_4' into QA_3_5

Browse Source 
Conflicts:
	libraries/common.lib.php
This commit is contained in:
Madhura Jayaratne 2012-02-19 21:32:16 +05:30
commit 3fadd41b41
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/Error.class.php
View File

@ -152,7 +152,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() .

17
libraries/common.lib.php
View File

@ -3832,21 +3832,4 @@ function PMA_printButton()
echo '<input type="button" id="print" value="' . __('Print') . '" />';
echo '</p>';
}
/**
* 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;
}
}
?>