diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
| commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
| tree | c8d0f78c2f47f373473419396d3c0855ec671eca /_test/cases/inc/parser/xhtml_htmlphp.test.php | |
| parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
| parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
| download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to '_test/cases/inc/parser/xhtml_htmlphp.test.php')
| -rw-r--r-- | _test/cases/inc/parser/xhtml_htmlphp.test.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/_test/cases/inc/parser/xhtml_htmlphp.test.php b/_test/cases/inc/parser/xhtml_htmlphp.test.php index 3493bab4d..65d64e579 100644 --- a/_test/cases/inc/parser/xhtml_htmlphp.test.php +++ b/_test/cases/inc/parser/xhtml_htmlphp.test.php @@ -5,9 +5,7 @@ require_once 'parser.inc.php'; require_once DOKU_INC.'inc/parser/xhtml.php'; require_once DOKU_INC.'inc/geshi.php'; -if ( !extension_loaded('runkit') && - !@dl('runkit.dll') && - !@dl('runkit.so' ) ){ +if (!extension_loaded('runkit')) { SimpleTestOptions::ignore('xhtml_htmlphp_test'); trigger_error('Skipping xhtml_htmlphp_test - http://www.php.net/runkit required'); } |