diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 15:27:25 -0400 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 15:27:25 -0400 |
| commit | c2b31ca1015872126b40fce5404da7216b8595c6 (patch) | |
| tree | 2383bab3e51ec21d220e91f0020bfb3ff43cec2b /build | |
| parent | f6865dc33a8cedb7d21a64401ed80d2edbac36bd (diff) | |
| parent | af693493985ca32faba4850f7fe060213f404f37 (diff) | |
| download | forums-c2b31ca1015872126b40fce5404da7216b8595c6.tar forums-c2b31ca1015872126b40fce5404da7216b8595c6.tar.gz forums-c2b31ca1015872126b40fce5404da7216b8595c6.tar.bz2 forums-c2b31ca1015872126b40fce5404da7216b8595c6.tar.xz forums-c2b31ca1015872126b40fce5404da7216b8595c6.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop:
[ticket/11704] Use the correct directory for dependency checking.
[ticket/11704] Correctly escape "
[ticket/11697] author_search() used incorrect parameter
Diffstat (limited to 'build')
| -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> |