Index: branches/5.3.x/install/upgrades.php =================================================================== diff -u -N -r15898 -r15924 --- branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 15898) +++ branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 15924) @@ -1,6 +1,6 @@ Array ('Core' => '5.2.1-B1'), '5.2.1-B2' => Array ('Core' => '5.2.1-B2'), '5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'), + '5.3.0-B1' => Array ('Core' => '5.3.0-B1'), ); } Index: branches/5.3.x/units/helpers/post_helper.php =================================================================== diff -u -N -r15694 -r15924 --- branches/5.3.x/units/helpers/post_helper.php (.../post_helper.php) (revision 15694) +++ branches/5.3.x/units/helpers/post_helper.php (.../post_helper.php) (revision 15924) @@ -1,6 +1,6 @@ GetDBField('TodayDate') ) { - $object->SetDBField('TodayDate', adodb_date('Y-m-d')); + $object->SetDBField('TodayDate', date('Y-m-d')); } $post_helper = $this->Application->recallObject('PostHelper'); Index: branches/5.3.x/units/posts/post_eh.php =================================================================== diff -u -N -r15694 -r15924 --- branches/5.3.x/units/posts/post_eh.php (.../post_eh.php) (revision 15694) +++ branches/5.3.x/units/posts/post_eh.php (.../post_eh.php) (revision 15924) @@ -1,6 +1,6 @@ Application->RecallVar('user_id'); - $now = adodb_mktime(); + $now = time(); $object->SetDBField('CreatedById', $user_id); $object->SetDBField('CreatedOn_date', $now); Index: branches/5.3.x/install/upgrades.sql =================================================================== diff -u -N -r15898 -r15924 --- branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15898) +++ branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15924) @@ -273,3 +273,5 @@ WHERE `Name` = 'In-Bulletin'; # ===== v 5.2.1-RC1 ===== + +# ===== v 5.3.0-B1 ===== Index: branches/5.3.x/units/polls/poll_eh.php =================================================================== diff -u -N -r15694 -r15924 --- branches/5.3.x/units/polls/poll_eh.php (.../poll_eh.php) (revision 15694) +++ branches/5.3.x/units/polls/poll_eh.php (.../poll_eh.php) (revision 15924) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBList */ - $object->addFilter('poll_range_filter', '(%1$s.StartDate <= ' . adodb_mktime() . ') AND (%1$s.EndDate >= ' . adodb_mktime() . ' OR EndDate IS NULL)'); + $object->addFilter('poll_range_filter', '(%1$s.StartDate <= ' . time() . ') AND (%1$s.EndDate >= ' . time() . ' OR EndDate IS NULL)'); $object->addFilter('poll_status', '(%1$s.Status = ' . STATUS_ACTIVE . ')'); } @@ -133,7 +133,7 @@ 'AnswerId' => $poll_answer_id, 'UserIP' => $ip_address, 'CreatedById' => $user_id, - 'AnswerDate' => adodb_mktime(), + 'AnswerDate' => time(), ); $this->Conn->doInsert($fields_hash, TABLE_PREFIX.'PollsStatistics');