|
@@ -21,7 +21,7 @@
|
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * Zend_Db_Table_Abstract
|
|
|
|
|
|
|
+ * @see Zend_Db_Table_Abstract
|
|
|
*/
|
|
*/
|
|
|
require_once 'Zend/Db/Table/Abstract.php';
|
|
require_once 'Zend/Db/Table/Abstract.php';
|
|
|
|
|
|
|
@@ -41,20 +41,20 @@ require_once 'Zend/Db/Table/Definition.php';
|
|
|
*/
|
|
*/
|
|
|
class Zend_Db_Table extends Zend_Db_Table_Abstract
|
|
class Zend_Db_Table extends Zend_Db_Table_Abstract
|
|
|
{
|
|
{
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* __construct() - For concrete implementation of Zend_Db_Table
|
|
* __construct() - For concrete implementation of Zend_Db_Table
|
|
|
*
|
|
*
|
|
|
* @param string|array $config string can reference a Zend_Registry key for a db adapter
|
|
* @param string|array $config string can reference a Zend_Registry key for a db adapter
|
|
|
- * OR it can refernece the name of a table
|
|
|
|
|
- * @param unknown_type $definition
|
|
|
|
|
|
|
+ * OR it can reference the name of a table
|
|
|
|
|
+ * @param array|Zend_Db_Table_Definition $definition
|
|
|
*/
|
|
*/
|
|
|
public function __construct($config = array(), $definition = null)
|
|
public function __construct($config = array(), $definition = null)
|
|
|
{
|
|
{
|
|
|
if ($definition !== null && is_array($definition)) {
|
|
if ($definition !== null && is_array($definition)) {
|
|
|
$definition = new Zend_Db_Table_Definition($definition);
|
|
$definition = new Zend_Db_Table_Definition($definition);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (is_string($config)) {
|
|
if (is_string($config)) {
|
|
|
if (Zend_Registry::isRegistered($config)) {
|
|
if (Zend_Registry::isRegistered($config)) {
|
|
|
trigger_error(__CLASS__ . '::' . __METHOD__ . '(\'registryName\') is not valid usage of Zend_Db_Table, '
|
|
trigger_error(__CLASS__ . '::' . __METHOD__ . '(\'registryName\') is not valid usage of Zend_Db_Table, '
|
|
@@ -73,12 +73,7 @@ class Zend_Db_Table extends Zend_Db_Table_Abstract
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
parent::__construct($config);
|
|
parent::__construct($config);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|