Changeset 15 for trunk/lib/App.inc.php

Timestamp:

Nov 13, 2005 4:51:22 AM (19 years ago)

Author:

scdev

Message:

M trunk/tests/run_tests.sh
Now can run tests without being in tests dir.

M trunk/tests/_config.inc.php
No change

M trunk/tests/Auth_SQLTest.php
...

M trunk/lib/RecordVersion.inc.php
Removed debugging.

M trunk/lib/DB.inc.php
Added die on connect error only if db_die_on_failure is true.

M trunk/lib/DBSessionHandler.inc.php
Added more accurate error-checking.

M trunk/lib/FormValidator.inc.php
Fixed email regex bugs.

M trunk/lib/SpellCheck.inc.php
Integrated lots of bug fixes from UK update.

M trunk/lib/Auth_SQL.inc.php
Lots of minor bug fixes.

M trunk/lib/App.inc.php
A couple minor bug fixes.

File:

• trunk/lib/App.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -441 +441 @@
             $this =& App::getInstance();
         }
-
-        if (!$this->running) {
-            return false;
-        }
         
         // If priority is not specified, assume the worst.
@@ -452 +448 @@
         }
     
-        // If log file is not specified, create one in the codebase root.
-        if ($this->getParam('log_directory') === null || !is_dir($this->getParam('log_directory')) || !is_writable($this->getParam('log_directory'))) {
-            // If log file is not specified, don't log to a file.
+        // If log file is not specified, don't log to a file.
+        if (!$this->getParam('log_directory') || !$this->getParam('log_filename') || !is_dir($this->getParam('log_directory')) || !is_writable($this->getParam('log_directory'))) {
             $this->setParam(array('log_file_priority' => false));
-            // We must use trigger_error rather than calling App::logMsg, which might lead to an infinite loop.
+            // We must use trigger_error to report this problem rather than calling App::logMsg, which might lead to an infinite loop.
             trigger_error(sprintf('Codebase error: log directory (%s) not found or writable.', $this->getParam('log_directory')), E_USER_NOTICE);
         }