extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only parse dates if they have a ? wildcard

Browse Source
This commit is contained in:
Nathan Gray 2013-01-24 16:35:39 +00:00
parent cea2c54ee1
commit 2b952c0157
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_sql.inc.php
View File

@ -388,7 +388,7 @@ class addressbook_sql extends so_sql_cf
} }
// Understand search by date with wildcard (????.10.??) according to user date preference // Understand search by date with wildcard (????.10.??) according to user date preference
if(is_string($criteria)) if(is_string($criteria) && strpos($criteria, '?') !== false)
{ {
$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']; $date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
// First, check for a 'date', with wildcards, in the user's format // First, check for a 'date', with wildcards, in the user's format
@ -399,7 +399,7 @@ class addressbook_sql extends so_sql_cf
foreach($matches[0] as $m_id => $match) foreach($matches[0] as $m_id => $match)
{ {
// Birthday is Y-m-d // Birthday is Y-m-d
$criteria = '*'.str_replace($match, "{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}",$criteria) . '*'; $criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*",$criteria);
} }
} }
} }