Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/3327' into develop
Browse files Browse the repository at this point in the history
Forward port #3327
  • Loading branch information
weierophinney committed Jan 4, 2013
2 parents 382c680 + 19c9989 commit 72ed7e4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions library/Zend/Authentication/Adapter/Digest.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ public function authenticate()
'identity' => array(
'realm' => $this->realm,
'username' => $this->username,
),
),
'messages' => array()
);
);

while (($line = fgets($fileHandle)) !== false) {
$line = trim($line);
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Di/InstanceManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class InstanceManager /* implements InstanceManagerInterface */
* alias|class => bool
*/
'shared' => true
);
);

/**
* An array of instance configuration data
Expand Down

0 comments on commit 72ed7e4

Please sign in to comment.