diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2007-07-01 09:50:17 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2007-07-01 09:50:17 +0000 |
| commit | 897b254855969df3ae595c84eafe794b48b4da7e (patch) | |
| tree | 780ef1c720e591a7f1de6763579fabafac9b26c3 /install_checks.php | |
| parent | ab89ec0ee443214d2570c70dbc7989cd263634d0 (diff) | |
| download | install-897b254855969df3ae595c84eafe794b48b4da7e.tar.gz install-897b254855969df3ae595c84eafe794b48b4da7e.tar.bz2 install-897b254855969df3ae595c84eafe794b48b4da7e.zip | |
deal with magickwand / imagick duo in a better way
Diffstat (limited to 'install_checks.php')
| -rw-r--r-- | install_checks.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/install_checks.php b/install_checks.php index e5b08b9..3580fdd 100644 --- a/install_checks.php +++ b/install_checks.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/install_checks.php,v 1.25 2007/07/01 09:40:03 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install_checks.php,v 1.26 2007/07/01 09:50:17 squareing Exp $ * @package install * @subpackage functions * @author xing @@ -99,16 +99,12 @@ function check_settings() { } $extensions[$ext]['note'] .= 'available.<br />'.$note; } - // if imagick or magickwand are installed, we remove the warning about the - // other extension - foreach( $extensions as $extension => $info ) { - if( $extension == 'magickwand' && $info['passed'] ) { - unset( $extensions['imagick'] ); - } - if( $extension == 'imagick' && $info['passed'] ) { - unset( $extensions['magickwand'] ); - } + // disable one of the imagick / magickwand warnings + if( $extensions['magickwand']['passed'] == TRUE && $extensions['imagick']['passed'] == FALSE ) { + unset( $extensions['imagick'] ); + } elseif( $extensions['imagick']['passed'] == TRUE && $extensions['magickwand']['passed'] == FALSE ) { + unset( $extensions['magickwand'] ); } // make sure we show the worning flag if there is a need for it |