Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/page.php

1 files changed, 21 insertions, 0 deletions

diff --git a/include/datetime.php b/include/datetime.php
index 94c2e4f1c..c0503fc7d 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -443,3 +443,24 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
 }
 
 
+
+
+function z_birthday($dob,$tz,$format="Y-m-d H:i:s") {
+
+	if(! strlen($tz))
+		$tz = 'UTC';
+
+	$tmp_dob = substr($dob,5);
+	if(intval($tmp_dob)) {
+		$y = datetime_convert($tz,$tz,'now','Y');
+		$bd = $y . '-' . $tmp_dob . ' 00:00';
+		$t_dob = strtotime($bd);
+		$now = strtotime(datetime_convert($tz,$tz,'now'));
+		if($t_dob < $now)
+			$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+		$birthday = datetime_convert($tz,'UTC',$bd,$format);
+	}
+
+	return $birthday;
+
+}