summaryrefslogtreecommitdiff
path: root/framework/Data/ActiveRecord
diff options
context:
space:
mode:
authorChristophe.Boulain <>2010-02-15 09:20:35 +0000
committerChristophe.Boulain <>2010-02-15 09:20:35 +0000
commitd860219f366a8fbe63b03d26c69525d4e6bd4f3a (patch)
tree6520a9a0a70a941d122de10d8f5ae9e3883a0ac6 /framework/Data/ActiveRecord
parent94e94e0a8566f23d16658a04c55b0bbfdd6689aa (diff)
Merge from r2765 (and some others) 3.1
Added TActiveTableRow QST page Corrected an uninitialized array in TScaffoldBase
Diffstat (limited to 'framework/Data/ActiveRecord')
-rw-r--r--framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
index 9c548308..b41a593e 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
@@ -4,7 +4,7 @@
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
* @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Data.ActiveRecord.Scaffold
@@ -65,6 +65,7 @@ abstract class TScaffoldBase extends TTemplateControl
*/
protected function getRecordPkValues($record)
{
+ $data=array();
foreach($this->getTableInfo()->getColumns() as $name=>$column)
{
if($column->getIsPrimaryKey())