Merge "Add CollationFa"

[lhc/web/wiklou.git] / includes / libs / time / ConvertibleTimestamp.php

diff --git a/includes/libs/time/ConvertibleTimestamp.php b/includes/libs/time/ConvertibleTimestamp.php
index 7cada84..c830b4e 100644 (file)
--- a/includes/libs/time/ConvertibleTimestamp.php
+++ b/includes/libs/time/ConvertibleTimestamp.php
@@ -90,7 +90,7 @@ class ConvertibleTimestamp {
                        # TS_MW
                } elseif ( preg_match( '/^(-?\d{1,13})(\.\d+)?$/D', $ts, $m ) ) {
                        # TS_UNIX
-                       $strtime = "@{$m[1]}"; // http://php.net/manual/en/datetime.formats.compound.php
+                       $strtime = "@{$m[1]}"; // https://secure.php.net/manual/en/datetime.formats.compound.php
                } elseif ( preg_match( '/^\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}.\d{6}$/', $ts ) ) {
                        # TS_ORACLE // session altered to DD-MM-YYYY HH24:MI:SS.FF6
                        $strtime = preg_replace( '/(\d\d)\.(\d\d)\.(\d\d)(\.(\d+))?/', "$1:$2:$3",
@@ -224,7 +224,7 @@ class ConvertibleTimestamp {
        }
 
        /**
-        * Calculate the difference between two ConvertableTimestamp objects.
+        * Calculate the difference between two ConvertibleTimestamp objects.
         *
         * @param ConvertibleTimestamp $relativeTo Base time to calculate difference from
         * @return DateInterval|bool The DateInterval object representing the