mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-01-03 05:11:52 +00:00
Make flush work with non-standard PHP binaries
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1661 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
parent
5489537b4b
commit
64d2da72f8
@ -18,7 +18,10 @@ function e($cmd) {
|
|||||||
if ($status) exit($status);
|
if ($status) exit($status);
|
||||||
}
|
}
|
||||||
|
|
||||||
e($argv[0] . ' generate-includes.php');
|
$php = $_SERVER['argv'][1];
|
||||||
e($argv[0] . ' generate-schema-cache.php');
|
if (!$php) $php = 'php';
|
||||||
e($argv[0] . ' flush-definition-cache.php');
|
|
||||||
e($argv[0] . ' generate-standalone.php');
|
e($php . ' generate-includes.php');
|
||||||
|
e($php . ' generate-schema-cache.php');
|
||||||
|
e($php . ' flush-definition-cache.php');
|
||||||
|
e($php . ' generate-standalone.php');
|
||||||
|
@ -198,7 +198,7 @@ class FailedTest extends UnitTestCase {
|
|||||||
* Flushes all caches, and fatally errors out if there's a problem.
|
* Flushes all caches, and fatally errors out if there's a problem.
|
||||||
*/
|
*/
|
||||||
function htmlpurifier_flush($php, $reporter) {
|
function htmlpurifier_flush($php, $reporter) {
|
||||||
exec($php . ' ../maintenance/flush.php', $out, $status);
|
exec($php . ' ../maintenance/flush.php ' . $php, $out, $status);
|
||||||
if ($status) {
|
if ($status) {
|
||||||
$test = new FailedTest(
|
$test = new FailedTest(
|
||||||
'maintenance/flush.php returned non-zero exit status',
|
'maintenance/flush.php returned non-zero exit status',
|
||||||
|
Loading…
Reference in New Issue
Block a user