nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-28 18:16:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix references to internal static variable.

Browse Source
This commit is contained in:
Andrew McMillan 2010-12-26 01:52:44 +13:00
parent 86216cd291
commit c189b36c28
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/RRule-v2.php
View File

@ -85,7 +85,7 @@ class RepeatRuleDateTime extends DateTime {
private $is_date;
public function __construct($date = null, $dtz = null) {
if ( !isset(RepeatRuleDateTime::$UTCzone) ) RepeatRuleDateTime::$UTCzone = new RepeatRuleTimeZone('UTC');
if ( !isset(self::$UTCzone) ) self::$UTCzone = new RepeatRuleTimeZone('UTC');
$this->is_date = false;
if ( !isset($date) ) return;
@ -97,7 +97,7 @@ class RepeatRuleDateTime extends DateTime {
$this->tzid = $dtz->tzid();
}
else {
$dtz = RepeatRuleDateTime::$UTCzone;
$dtz = self::$UTCzone;
if ( substr($actual_date,strlen($actual_date),1) == 'Z' ) {
$this->tzid = 'UTC';
$actual_date = substr($actual_date, 0, strlen($actual_date) - 1);
@ -114,7 +114,7 @@ class RepeatRuleDateTime extends DateTime {
$date = $matches[2];
$this->is_date = (strlen($date) == 8);
if ( isset($matches[4]) && $matches[4] == 'Z' ) {
$dtz = RepeatRuleDateTime::$UTCzone;
$dtz = self::$UTCzone;
$this->tzid = 'UTC';
}
else if ( isset($matches[1]) && $matches[1] != '' ) {
@ -122,7 +122,7 @@ class RepeatRuleDateTime extends DateTime {
$this->tzid = $dtz->tzid();
}
else {
$dtz = RepeatRuleDateTime::$UTCzone;
$dtz = self::$UTCzone;
$this->tzid = null;
}
// printf( "Date%s value with timezone: %s in %s\n", ($this->is_date?"":"Time"), $date, $this->tzid );
@ -132,12 +132,12 @@ class RepeatRuleDateTime extends DateTime {
$this->is_date = true;
$date = $matches[1];
// Floating
$dtz = RepeatRuleDateTime::$UTCzone;
$dtz = self::$UTCzone;
$this->tzid = null;
// printf( "Date value: %s\n", $date );
}
elseif ( $dtz === null || $dtz == '' ) {
$dtz = RepeatRuleDateTime::$UTCzone;
$dtz = self::$UTCzone;
if ( preg_match('/(\d{8}(T\d{6})?)(Z?)/', $date, $matches) ) {
$date = $matches[1];
$this->tzid = ( $matches[3] == 'Z' ? 'UTC' : null );