From a6d05624f50052edd42593d26775557209f3c6c5 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 18 Oct 2007 19:13:30 +0000
Subject: [PATCH] fixed versionable template to adhere to generic plugin
structure
---
lib/Doctrine/AuditLog.php | 2 --
lib/Doctrine/Template/Versionable.php | 14 ++++++--------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/lib/Doctrine/AuditLog.php b/lib/Doctrine/AuditLog.php
index 7e7d89365..cb516a900 100644
--- a/lib/Doctrine/AuditLog.php
+++ b/lib/Doctrine/AuditLog.php
@@ -39,8 +39,6 @@ class Doctrine_AuditLog extends Doctrine_Plugin
'pluginTable' => false,
);
- protected $_auditTable;
-
public function __construct($options)
{
$this->_options = array_merge($this->_options, $options);
diff --git a/lib/Doctrine/Template/Versionable.php b/lib/Doctrine/Template/Versionable.php
index df715d6af..6d9a332d8 100644
--- a/lib/Doctrine/Template/Versionable.php
+++ b/lib/Doctrine/Template/Versionable.php
@@ -31,21 +31,19 @@
*/
class Doctrine_Template_Versionable extends Doctrine_Template
{
- protected $_auditLog;
-
public function __construct(array $options)
{
- $this->_auditLog = new Doctrine_AuditLog($options);
+ $this->_plugin = new Doctrine_AuditLog($options);
}
public function setUp()
{
- $this->_auditLog->setOption('table', $this->_table);
- $this->_auditLog->buildDefinition($this->_table);
+ $this->_plugin->setOption('table', $this->_table);
+ $this->_plugin->buildDefinition($this->_table);
- $this->addListener(new Doctrine_AuditLog_Listener($this->_auditLog));
+ $this->addListener(new Doctrine_AuditLog_Listener($this->_plugin));
}
public function getAuditLog()
{
- return $this->_auditLog;
+ return $this->_plugin;
}
-}
\ No newline at end of file
+}