Permalink
Browse files

Merge branch 'MDL-36015_23' of git://git.catalyst.net.nz/moodle-r2 in…

…to MOODLE_23_STABLE
  • Loading branch information...
2 parents 33abc6e + 84b3cba commit c64d22325ebeff0d5f17cf4281cbc391742f2a2d @danpoltawski danpoltawski committed Oct 30, 2012
Showing with 7 additions and 7 deletions.
  1. +2 −2 lib/bennu/bennu.class.php
  2. +5 −5 lib/bennu/iCalendar_parameters.php
@@ -13,14 +13,14 @@
*/
class Bennu {
- function timestamp_to_datetime($t = NULL) {
+ static function timestamp_to_datetime($t = NULL) {
if($t === NULL) {
$t = time();
}
return gmstrftime('%Y%m%dT%H%M%SZ', $t);
}
- function generate_guid() {
+ static function generate_guid() {
// Implemented as per the Network Working Group draft on UUIDs and GUIDs
// These two octets get special treatment
@@ -14,7 +14,7 @@
*/
class iCalendar_parameter {
- function multiple_values_allowed($parameter) {
+ static function multiple_values_allowed($parameter) {
switch($parameter) {
case 'DELEGATED-FROM':
case 'DELEGATED-TO':
@@ -25,7 +25,7 @@ function multiple_values_allowed($parameter) {
}
}
- function default_value($parameter) {
+ static function default_value($parameter) {
switch($parameter) {
case 'CUTYPE': return 'INDIVIDUAL';
case 'FBTYPE': return 'BUSY';
@@ -38,7 +38,7 @@ function default_value($parameter) {
}
}
- function is_valid_value(&$parent_property, $parameter, $value) {
+ static function is_valid_value(&$parent_property, $parameter, $value) {
switch($parameter) {
// These must all be a URI
case 'ALTREP':
@@ -191,7 +191,7 @@ function is_valid_value(&$parent_property, $parameter, $value) {
}
}
- function do_value_formatting($parameter, $value) {
+ static function do_value_formatting($parameter, $value) {
switch($parameter) {
// Parameters of type CAL-ADDRESS or URI MUST be double-quoted
case 'ALTREP':
@@ -232,7 +232,7 @@ function do_value_formatting($parameter, $value) {
}
}
- function undo_value_formatting($parameter, $value) {
+ static function undo_value_formatting($parameter, $value) {
}
}

0 comments on commit c64d223

Please sign in to comment.