diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-02-10 16:08:07 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-02-10 16:08:07 +0100 |
| commit | 2c1b25d68193117a555ae54c498e602993a1aa2c (patch) | |
| tree | c68493d93e7a8caf678ea8b62880c6cc8cb2ad43 /etc/inc/pfsense-utils.inc | |
| parent | 9103d9ee6c46a3fd36f2dfb5cd624a8e6a5366a8 (diff) | |
| parent | 0fc6be3f54db706ccc7cce8b19b12f88dec171fa (diff) | |
| download | pfsense-2c1b25d68193117a555ae54c498e602993a1aa2c.zip pfsense-2c1b25d68193117a555ae54c498e602993a1aa2c.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc/pfsense-utils.inc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 1365f05..54ca19f 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1689,9 +1689,9 @@ function version_compare_dates($a, $b) { if ((!$a_time) || (!$b_time)) { return FALSE; } else { - if ($a < $b) + if ($a_time < $b_time) return -1; - elseif ($a == $b) + elseif ($$a_time == $b_time) return 0; else return 1; @@ -1750,7 +1750,7 @@ function version_compare_numeric($a, $b) { } function pfs_version_compare($cur_time, $cur_text, $remote) { // First try date compare - $v = version_compare_dates($cur_time, $b); + $v = version_compare_dates($cur_time, $remote); if ($v === FALSE) { // If that fails, try to compare by string // Before anything else, simply test if the strings are equal |
