Merge branch 'master' of https://github.com/ulrikjohansson/idiorm int…

…o develop
j4mie · Sep 3, 2013 · a1f5dc4 · a1f5dc4
2 parents 25cd48a + 3d52967
commit a1f5dc4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/idiorm.php b/idiorm.php
@@ -273,7 +273,7 @@ protected static function _setup_db_config($connection_name) {
          * This is public in case the ORM should use a ready-instantiated
          * PDO object as its database connection. Accepts an optional string key
          * to identify the connection if multiple connections are used.
-         * @param ORM $db
+         * @param PDO $db
          * @param string $connection_name Which connection to use
          */
         public static function set_db($db, $connection_name = self::DEFAULT_CONNECTION) {