Merge branch 'release-1.1' into develop

This commit is contained in:
Thomas Keller 2011-03-25 00:14:26 +01:00
commit 002fa05c7f
2 changed files with 9 additions and 1 deletions

View File

@ -10,6 +10,14 @@
## Translations
# InDefero 1.1.1 - xxx xxx xx xx:xx 2011 UTC
## Bugfixes
- Fix PHP error when trying to create Mercurial source archives (issue 648)
# InDefero 1.1 - Sun Mar 20 11:44 2011 UTC
## New Features

View File

@ -463,7 +463,7 @@ class IDF_Scm_Mercurial extends IDF_Scm
* @param string Prefix ('git-repo-dump')
* @return Pluf_HTTP_Response The HTTP response containing the zip archive
*/
protected function getArchiveStream($commit, $prefix='')
public function getArchiveStream($commit, $prefix='')
{
$cmd = sprintf(Pluf::f('idf_exec_cmd_prefix', '').
Pluf::f('hg_path', 'hg').' archive --type=zip -R %s -r %s -',