Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / plugins / Irc / extlib / phergie / Phergie / Config.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Config.php b/plugins/Irc/extlib/phergie/Phergie/Config.php
index f011db2365dc61cbf5afc2b99c9cb4191d076a3d..c182f2ac1ea1e5b8c5f300f2cd5f84c4d1c8b8db 100755 (executable)
--- a/plugins/Irc/extlib/phergie/Phergie/Config.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Config.php
@@ -82,6 +82,22 @@ class Phergie_Config implements ArrayAccess
         return $this;
     }
 
+    /**
+     * Merges an associative array of configuration setting values into the
+     * current configuration settings.
+     *
+     * @param array $settings Associative array of configuration setting
+     *        values keyed by setting name
+     *
+     * @return Phergie_Config Provides a fluent interface
+     */
+    public function readArray(array $settings)
+    {
+        $this->settings += $settings;
+
+        return $this;
+    }
+
     /**
      * Writes the values of the current configuration settings back to their
      * originating files.