Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.5' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jan 25, 2014
2 parents 372acbf + 7149fd7 commit 0a367f0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions htdocs/core/lib/functions2.lib.php
Expand Up @@ -551,9 +551,9 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m

// For debugging
//include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
//$mask='{yyyy}-{0000}';
//$mask='FA{yy}{mm}-{0000@99}';
//$date=dol_mktime(12, 0, 0, 1, 1, 1900);
//$date=dol_stringtotime('20121001');
//$date=dol_stringtotime('20130101');

// Extract value for mask counter, mask raz and mask offset
if (! preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$mask,$reg)) return 'ErrorBadMask';
Expand Down

0 comments on commit 0a367f0

Please sign in to comment.