mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Check variable type during toDB() test. Optimized toDB() for non-string types.

Browse Source
This commit is contained in:
Cameron
2020-12-14 07:27:51 -08:00
parent d5a1e77ca1
commit 2a31f831a9
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_handlers/e_parse_class.php
View File

@@ -486,12 +486,14 @@ class e_parse extends e_parser
*/ */
public function toDB($data = null, $nostrip =false, $no_encode = false, $mod = false, $parm = null) public function toDB($data = null, $nostrip =false, $no_encode = false, $mod = false, $parm = null)
{ {
if($data === null) $variableType = gettype($data);
if(($variableType !== 'string' && $variableType !== 'array' ) || $data === '0')
{ {
return null; return $data;
} }
if (is_array($data)) if ($variableType === 'array')
{ {
$ret = array(); $ret = array();
@@ -505,16 +507,12 @@ class e_parse extends e_parser
return $ret; return $ret;
} }
if (MAGIC_QUOTES_GPC == true && $nostrip == false) if (MAGIC_QUOTES_GPC == true && $nostrip == false)
{ {
$data = stripslashes($data); $data = stripslashes($data);
} }
if(intval($data) === $data || $data === '0') // simple integer.
{
return $data;
}
$core_pref = e107::getConfig(); $core_pref = e107::getConfig();
if ($mod !== 'pReFs') //XXX We're not saving prefs. if ($mod !== 'pReFs') //XXX We're not saving prefs.

2
e107_tests/tests/unit/e_parseTest.php
View File

@@ -457,7 +457,7 @@ while($row = $sql->fetch())
$parm = varset($var['parm']); $parm = varset($var['parm']);
$result = $this->tp->toDB($var['input'], false, false, $mode, $parm); $result = $this->tp->toDB($var['input'], false, false, $mode, $parm);
$this->assertEquals($var['expected'], $result, 'Test #'.$k." failed.". print_r($this->tp->getRemoved(),true)); $this->assertSame($var['expected'], $result, 'Test #'.$k." failed.". print_r($this->tp->getRemoved(),true));
} }