diff options
| author | Michael Wallner <mike@php.net> | 2015-03-30 15:41:53 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2015-03-30 15:41:53 +0200 |
| commit | 8994a5eb1da5f6c3d9e16aaaca60bb96ded82c79 (patch) | |
| tree | 25f31483ce0a0f471d11a389e6d017708715564f | |
| parent | e148fff61d6e0129fd39b43808322521034b4191 (diff) | |
| parent | a24aefaac230fc4532496a86a085f91784098826 (diff) | |
| download | php-git-8994a5eb1da5f6c3d9e16aaaca60bb96ded82c79.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN
Fixed Bug #65467
| -rw-r--r-- | ext/phar/phar/pharcommand.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc index cb343675b5..a58a9f060a 100644 --- a/ext/phar/phar/pharcommand.inc +++ b/ext/phar/phar/pharcommand.inc @@ -397,7 +397,7 @@ class PharCommand extends CLICommand */ static function cli_arg_typ_privkey($arg, $cfg, $key) { - $arg = self::cli_arg_typ_string($arg, $cfg, $key); + $arg = self::cli_arg_typ_filecont($arg, $cfg, $key); $hash_avail = Phar::getSupportedSignatures(); if ($arg && !in_array('OpenSSL', $hash_avail)) |