diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-07-14 13:56:05 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-07-14 13:56:05 -0400 |
| commit | af693493985ca32faba4850f7fe060213f404f37 (patch) | |
| tree | c91c5988b0f087e5b954921c5be90cb409b1368b | |
| parent | 58a9e975f83a8a7b3255052ff9d3dccb0af2d974 (diff) | |
| parent | 8d8a0602d6670764ccd01b2082b9d085f773f8e0 (diff) | |
| download | forums-af693493985ca32faba4850f7fe060213f404f37.tar forums-af693493985ca32faba4850f7fe060213f404f37.tar.gz forums-af693493985ca32faba4850f7fe060213f404f37.tar.bz2 forums-af693493985ca32faba4850f7fe060213f404f37.tar.xz forums-af693493985ca32faba4850f7fe060213f404f37.zip | |
Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop
* github-phpbb/develop-olympus:
[ticket/11704] Use the correct directory for dependency checking.
[ticket/11704] Correctly escape "
| -rw-r--r-- | build/build.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 5b4cf8b496..f8181160c1 100644 --- a/build/build.xml +++ b/build/build.xml @@ -170,8 +170,8 @@ checkreturn="true" /> <!-- Install composer dependencies, if there are any. --> - <exec dir="." - command='php -r "\$j = json_decode(file_get_contents("composer.json")); echo isset(\$j->require);"' + <exec dir="${dir}" + command='php -r "\$j = json_decode(file_get_contents(\"composer.json\")); echo isset(\$j->require);"' checkreturn="true" outputProperty='composer-has-dependencies' /> <if> |