[geeklog-cvs] geeklog: Reverting change to is_dir - mogrify is an exectuable, ...

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Thu Jun 2 04:36:08 EDT 2011


changeset 8303:939dbd0a3ab1
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/939dbd0a3ab1
user: Dirk Haun <dirk at haun-online.de>
date: Thu Jun 02 10:36:00 2011 +0200
description:
Reverting change to is_dir - mogrify is an exectuable, so using file_exists was correct

diffstat:

 public_html/admin/configuration.php |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r fcf965a0e8b1 -r 939dbd0a3ab1 public_html/admin/configuration.php
--- a/public_html/admin/configuration.php	Tue May 31 10:18:21 2011 -0400
+++ b/public_html/admin/configuration.php	Thu Jun 02 10:36:00 2011 +0200
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
+// | Geeklog 1.8                                                               |
 // +---------------------------------------------------------------------------+
 // | configuration.php                                                         |
 // |                                                                           |
 // | Loads the administration UI and sends input to config.class               |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2007-2010 by the following authors:                         |
+// | Copyright (C) 2007-2011 by the following authors:                         |
 // |                                                                           |
 // | Authors: Aaron Blankstein  - kantai AT gmail DOT com                      |
 // |          Akeda Bagus       - admin AT gedex DOT web DOT id                |
@@ -335,7 +335,7 @@
     $ret = false;
     if ( isset($ruleParams[0]['path_to_mogrify']) && isset($_CONF['image_lib']) &&
          $_CONF['image_lib'] == 'imagemagick' &&
-         is_dir($ruleParams[0]['path_to_mogrify']) )
+         file_exists($ruleParams[0]['path_to_mogrify']) )
     {
         $ret = true;
     }



More information about the geeklog-cvs mailing list