diff options
| author | Michael Wallner <mike@php.net> | 2015-03-30 15:41:03 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2015-03-30 15:41:03 +0200 |
| commit | 3c22449649a2c86cf0065788bd08f49759d6c750 (patch) | |
| tree | 06ddf16ac4723739710ada6021844154e34c8c37 | |
| parent | 64d9c98fa9be3a67f01df68102e94ca80fcc75c9 (diff) | |
| parent | 6de25c155e3a90c273af311d71298ec88ac61833 (diff) | |
| download | php-git-3c22449649a2c86cf0065788bd08f49759d6c750.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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)) |