From b91f359f1c5bb89d7c22e8cf234f71105140cdf9 Mon Sep 17 00:00:00 2001
From: Silvio <silvio@devlet.com.br>
Date: Thu, 8 Apr 2010 14:57:27 -0300
Subject: CinisisDb::file() now accepts arrays

---
 classes/CinisisDb.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'classes/CinisisDb.php')

diff --git a/classes/CinisisDb.php b/classes/CinisisDb.php
index eb09f9e..3a5ab4a 100644
--- a/classes/CinisisDb.php
+++ b/classes/CinisisDb.php
@@ -122,7 +122,8 @@ class CinisisDb {
    * Get a file path.
    *
    * @param $config
-   *   Config file name (either relative to the library or absolute).
+   *   Config file name (either relative to the library or absolute)
+   *   or array with configuration.
    *
    * @param $section
    *   Config file section (ignored for absolute files).
@@ -131,8 +132,11 @@ class CinisisDb {
    *   Return the assembled file path.
    */
   public function file($config = NULL, $section = 'config') {
-    // Check for NULL or relative config path.
-    if ($config == NULL) {
+    // Check config format (array, NULL or relative config path).
+    if (is_array($config)) {
+      return $config;
+    }
+    elseif ($config == NULL) {
       $config = "$section/config.yaml";
     }
     elseif (substr($config, 0, 1) != '/') {
-- 
cgit v1.2.3