summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/adodb-mssql.inc.php14
-rw-r--r--drivers/adodb-mssqlnative.inc.php10
2 files changed, 14 insertions, 10 deletions
diff --git a/drivers/adodb-mssql.inc.php b/drivers/adodb-mssql.inc.php
index c137d17a..596e1245 100644
--- a/drivers/adodb-mssql.inc.php
+++ b/drivers/adodb-mssql.inc.php
@@ -1161,10 +1161,11 @@ class ADORecordSet_array_mssql extends ADORecordSet_array {
// mssql uses a default date like Dec 30 2000 12:00AM
static function UnixDate($v)
{
+ if (is_numeric(substr($v,0,1))) {
+ return parent::UnixDate($v);
+ }
- if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-
- global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+ global $ADODB_mssql_mths,$ADODB_mssql_date_order;
//Dec 30 2000 12:00AM
if ($ADODB_mssql_date_order == 'dmy') {
@@ -1192,10 +1193,11 @@ class ADORecordSet_array_mssql extends ADORecordSet_array {
static function UnixTimeStamp($v)
{
+ if (is_numeric(substr($v,0,1))) {
+ return parent::UnixTimeStamp($v);
+ }
- if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-
- global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+ global $ADODB_mssql_mths,$ADODB_mssql_date_order;
//Dec 30 2000 12:00AM
if ($ADODB_mssql_date_order == 'dmy') {
diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php
index 81f98d53..c4200208 100644
--- a/drivers/adodb-mssqlnative.inc.php
+++ b/drivers/adodb-mssqlnative.inc.php
@@ -1287,8 +1287,9 @@ class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
// mssql uses a default date like Dec 30 2000 12:00AM
static function UnixDate($v)
{
-
- if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
+ if (is_numeric(substr($v,0,1))) {
+ return parent::UnixDate($v);
+ }
global $ADODB_mssql_mths,$ADODB_mssql_date_order;
@@ -1318,8 +1319,9 @@ class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
static function UnixTimeStamp($v)
{
-
- if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
+ if (is_numeric(substr($v,0,1))) {
+ return parent::UnixTimeStamp($v);
+ }
global $ADODB_mssql_mths,$ADODB_mssql_date_order;