Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #158 from marc1706/birthday/php_5_5_compat

Browse Source 
[birthday/php_5_5_compat] Filter out array elements from lang dates
This commit is contained in:
Marc Alexander
2013-10-26 09:43:33 -07:00
parent c2e839defb 6bbd7cff42
commit bd78cc73cd
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
root/portal/modules/portal_birthday_list.php
View File

@@ -172,8 +172,23 @@ class portal_birthday_list_module
$date = explode('-', $birthday); $date = explode('-', $birthday);
$time = mktime(0, 0, 0, $date[1], $date[0], $date[2]); $time = mktime(0, 0, 0, $date[1], $date[0], $date[2]);
$lang_dates = $user->lang['datetime']; $lang_dates = array_filter($user->lang['datetime'], array($this, 'filter_lang_dates'));
return strtr(date($date_settings, $time), $lang_dates); return strtr(date($date_settings, $time), $lang_dates);
} }
/**
* Filter out lang dates that are not arrays.
* This is required in order to prevent PHP notices in PHP >= 5.4.12
* that happen if an array that is passed to strtr() has rows that are
* arrays.
*
* @param mixed $row Current row of array
*
* @return bool True if array row is not an array
*/
protected function filter_lang_dates($row)
{
return !is_array($row);
}
} }