Commit ef2b62d8 authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #614 in ZP/z-push from...

Merge pull request #614 in ZP/z-push from bugfix/ZP-1308-incompatible-php-5.4-code-in-filestatemachine to develop

* commit '37f5f0cf':
  ZP-1308 If no pattern is transmitted, set the pattern to null and replace it inside the method.
parents fc985834 37f5f0cf
...@@ -497,7 +497,10 @@ class FileStateMachine implements IStateMachine { ...@@ -497,7 +497,10 @@ class FileStateMachine implements IStateMachine {
* @access public * @access public
* @return array * @return array
*/ */
protected function getStateFiles($pattern = STATE_DIR.'*/*/*') { protected function getStateFiles($pattern = null) {
if ($pattern === null) {
$pattern = STATE_DIR.'*/*/*';
}
if (empty($this->statefiles) || $pattern != $this->pattern) { if (empty($this->statefiles) || $pattern != $this->pattern) {
$this->statefiles = glob($pattern, GLOB_NOSORT); $this->statefiles = glob($pattern, GLOB_NOSORT);
$this->pattern = $pattern; $this->pattern = $pattern;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment