makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop

Browse source 
* github-phpbb/develop-olympus:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
This commit is contained in:
Nils Adermann 2013-07-14 13:56:05 -04:00
commit af69349398
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/build.xml
View file

@ -170,8 +170,8 @@
checkreturn="true" /> checkreturn="true" />
<!-- Install composer dependencies, if there are any. --> <!-- Install composer dependencies, if there are any. -->
<exec dir="." <exec dir="${dir}"
command='php -r "\$j = json_decode(file_get_contents("composer.json")); echo isset(\$j->require);"' command='php -r "\$j = json_decode(file_get_contents(\"composer.json\")); echo isset(\$j->require);"'
checkreturn="true" checkreturn="true"
outputProperty='composer-has-dependencies' /> outputProperty='composer-has-dependencies' />
<if> <if>