Changeset 3045

Timestamp:

07/11/2008 02:16:17 AM (5 months ago)

Author:

Geert

Message:

Allowing to pass config group string to Captcha constructor.

Files:

• trunk/system/libraries/Captcha.php (modified) (3 diffs)

trunk/system/libraries/Captcha.php

@@ -32 +32 @@
          * Constructs and returns a new Captcha object.
          *
-         * @param   array   configuration settings
+         * @param   string|array  config group or settings
          * @return  object
          */
@@ -44 +44 @@
          *
          * @throws  Kohana_Exception
-         * @param   array  configuration settings
+         * @param   string|array  config group or settings
          * @return  void
          */
@@ -55 +55 @@
                         throw new Kohana_Exception('captcha.requires_GD2');
 
+                // Only config group name given
+                if (is_string($config))
+                {
+                        $config = array('group' => $config);
+                }
                 // No custom config group name given
-                if ( ! isset($config['group']))
+                elseif ( ! isset($config['group']))
                 {
                         $config['group'] = 'default';