svn: /web/doc-editor/trunk/php/ Conf.php

yannick                                  Thu, 22 Apr 2010 11:27:12 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=298311

Log:
Exclude localConf.ini when we load others project conf files

Changed paths:
    U   web/doc-editor/trunk/php/Conf.php

Modified: web/doc-editor/trunk/php/Conf.php
===================================================================
--- web/doc-editor/trunk/php/Conf.php	2010-04-22 11:20:44 UTC (rev 298310)
+++ web/doc-editor/trunk/php/Conf.php	2010-04-22 11:27:12 UTC (rev 298311)
@@ -38,7 +38,7 @@
         // Second, we load all config project file
         $d = dir($p);
         while (false !== ($entry = $d->read())) {
-            if( is_file($p.$entry) && $entry != 'conf.ini' ) {
+            if( is_file($p.$entry) && ( $entry != 'conf.ini' && $entry != 'localConf.ini' ) ) {

                // Get the name of the project directly into the filename
                $t = explode(".", $entry);