Author: jablko
Date: Sun Oct 31 20:31:01 2010
New Revision: 8729
Log:
Rollback commit 8148
Modified:
trunk/lib/model/om/BaseActorI18n.php
trunk/lib/model/om/BaseContactInformation.php
trunk/lib/model/om/BaseContactInformationI18n.php
trunk/lib/model/om/BaseEventI18n.php
trunk/lib/model/om/BaseFunctionI18n.php
trunk/lib/model/om/BaseInformationObjectI18n.php
trunk/lib/model/om/BaseMap.php
trunk/lib/model/om/BaseMapI18n.php
trunk/lib/model/om/BaseMenu.php
trunk/lib/model/om/BaseMenuI18n.php
trunk/lib/model/om/BaseNote.php
trunk/lib/model/om/BaseNoteI18n.php
trunk/lib/model/om/BaseOaiHarvest.php
trunk/lib/model/om/BaseOaiRepository.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseOtherName.php
trunk/lib/model/om/BaseOtherNameI18n.php
trunk/lib/model/om/BasePhysicalObjectI18n.php
trunk/lib/model/om/BasePlaceI18n.php
trunk/lib/model/om/BaseProperty.php
trunk/lib/model/om/BasePropertyI18n.php
trunk/lib/model/om/BaseRepositoryI18n.php
trunk/lib/model/om/BaseRights.php
trunk/lib/model/om/BaseRightsI18n.php
trunk/lib/model/om/BaseRightsTermRelation.php
trunk/lib/model/om/BaseSetting.php
trunk/lib/model/om/BaseSettingI18n.php
trunk/lib/model/om/BaseSlug.php
trunk/lib/model/om/BaseStaticPageI18n.php
trunk/lib/model/om/BaseStatus.php
trunk/lib/model/om/BaseSystemEvent.php
trunk/lib/model/om/BaseTaxonomyI18n.php
trunk/lib/model/om/BaseTermI18n.php
trunk/lib/propel/builder/QubitObjectBuilder.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editDefaultAclAction.class.php
(props changed)
Modified: trunk/lib/model/om/BaseActorI18n.php
==============================================================================
--- trunk/lib/model/om/BaseActorI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseActorI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -56,7 +56,6 @@
$keys = array();
$keys['id'] = $row[13];
$keys['culture'] = $row[14];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$actorI18ns[$key]))
Modified: trunk/lib/model/om/BaseContactInformation.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformation.php Sun Oct 31 20:11:15
2010 (r8728)
+++ trunk/lib/model/om/BaseContactInformation.php Sun Oct 31 20:31:01
2010 (r8729)
@@ -59,7 +59,6 @@
{
$keys = array();
$keys['id'] = $row[15];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$contactInformations[$key]))
Modified: trunk/lib/model/om/BaseContactInformationI18n.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformationI18n.php Sun Oct 31 20:11:15
2010 (r8728)
+++ trunk/lib/model/om/BaseContactInformationI18n.php Sun Oct 31 20:31:01
2010 (r8729)
@@ -38,7 +38,6 @@
$keys = array();
$keys['id'] = $row[4];
$keys['culture'] = $row[5];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$contactInformationI18ns[$key]))
Modified: trunk/lib/model/om/BaseEventI18n.php
==============================================================================
--- trunk/lib/model/om/BaseEventI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseEventI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -36,7 +36,6 @@
$keys = array();
$keys['id'] = $row[3];
$keys['culture'] = $row[4];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$eventI18ns[$key]))
Modified: trunk/lib/model/om/BaseFunctionI18n.php
==============================================================================
--- trunk/lib/model/om/BaseFunctionI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseFunctionI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -50,7 +50,6 @@
$keys = array();
$keys['id'] = $row[10];
$keys['culture'] = $row[11];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$functionI18ns[$key]))
Modified: trunk/lib/model/om/BaseInformationObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObjectI18n.php Sun Oct 31 20:11:15
2010 (r8728)
+++ trunk/lib/model/om/BaseInformationObjectI18n.php Sun Oct 31 20:31:01
2010 (r8729)
@@ -72,7 +72,6 @@
$keys = array();
$keys['id'] = $row[21];
$keys['culture'] = $row[22];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$informationObjectI18ns[$key]))
Modified: trunk/lib/model/om/BaseMap.php
==============================================================================
--- trunk/lib/model/om/BaseMap.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseMap.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -35,7 +35,6 @@
{
$keys = array();
$keys['id'] = $row[3];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$maps[$key]))
Modified: trunk/lib/model/om/BaseMapI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMapI18n.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseMapI18n.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -34,7 +34,6 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$mapI18ns[$key]))
Modified: trunk/lib/model/om/BaseMenu.php
==============================================================================
--- trunk/lib/model/om/BaseMenu.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseMenu.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -45,7 +45,6 @@
{
$keys = array();
$keys['id'] = $row[8];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$menus[$key]))
Modified: trunk/lib/model/om/BaseMenuI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMenuI18n.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseMenuI18n.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -34,7 +34,6 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$menuI18ns[$key]))
Modified: trunk/lib/model/om/BaseNote.php
==============================================================================
--- trunk/lib/model/om/BaseNote.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseNote.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -49,7 +49,6 @@
{
$keys = array();
$keys['id'] = $row[10];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$notes[$key]))
Modified: trunk/lib/model/om/BaseNoteI18n.php
==============================================================================
--- trunk/lib/model/om/BaseNoteI18n.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseNoteI18n.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -32,7 +32,6 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$noteI18ns[$key]))
Modified: trunk/lib/model/om/BaseOaiHarvest.php
==============================================================================
--- trunk/lib/model/om/BaseOaiHarvest.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseOaiHarvest.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -45,7 +45,6 @@
{
$keys = array();
$keys['id'] = $row[0];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$oaiHarvests[$key]))
Modified: trunk/lib/model/om/BaseOaiRepository.php
==============================================================================
--- trunk/lib/model/om/BaseOaiRepository.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseOaiRepository.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -41,7 +41,6 @@
{
$keys = array();
$keys['id'] = $row[0];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$oaiRepositorys[$key]))
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseObject.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -35,7 +35,6 @@
{
$keys = array();
$keys['id'] = $row[3];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$objects[$key]))
Modified: trunk/lib/model/om/BaseOtherName.php
==============================================================================
--- trunk/lib/model/om/BaseOtherName.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseOtherName.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -39,7 +39,6 @@
{
$keys = array();
$keys['id'] = $row[5];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$otherNames[$key]))
Modified: trunk/lib/model/om/BaseOtherNameI18n.php
==============================================================================
--- trunk/lib/model/om/BaseOtherNameI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseOtherNameI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -34,7 +34,6 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$otherNameI18ns[$key]))
Modified: trunk/lib/model/om/BasePhysicalObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObjectI18n.php Sun Oct 31 20:11:15
2010 (r8728)
+++ trunk/lib/model/om/BasePhysicalObjectI18n.php Sun Oct 31 20:31:01
2010 (r8729)
@@ -36,7 +36,6 @@
$keys = array();
$keys['id'] = $row[3];
$keys['culture'] = $row[4];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$physicalObjectI18ns[$key]))
Modified: trunk/lib/model/om/BasePlaceI18n.php
==============================================================================
--- trunk/lib/model/om/BasePlaceI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BasePlaceI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -38,7 +38,6 @@
$keys = array();
$keys['id'] = $row[4];
$keys['culture'] = $row[5];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$placeI18ns[$key]))
Modified: trunk/lib/model/om/BaseProperty.php
==============================================================================
--- trunk/lib/model/om/BaseProperty.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseProperty.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -41,7 +41,6 @@
{
$keys = array();
$keys['id'] = $row[6];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$propertys[$key]))
Modified: trunk/lib/model/om/BasePropertyI18n.php
==============================================================================
--- trunk/lib/model/om/BasePropertyI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BasePropertyI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -32,7 +32,6 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$propertyI18ns[$key]))
Modified: trunk/lib/model/om/BaseRepositoryI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRepositoryI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseRepositoryI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -60,7 +60,6 @@
$keys = array();
$keys['id'] = $row[15];
$keys['culture'] = $row[16];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$repositoryI18ns[$key]))
Modified: trunk/lib/model/om/BaseRights.php
==============================================================================
--- trunk/lib/model/om/BaseRights.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseRights.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -39,7 +39,6 @@
{
$keys = array();
$keys['id'] = $row[5];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$rightss[$key]))
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseRightsI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -32,7 +32,6 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$rightsI18ns[$key]))
Modified: trunk/lib/model/om/BaseRightsTermRelation.php
==============================================================================
--- trunk/lib/model/om/BaseRightsTermRelation.php Sun Oct 31 20:11:15
2010 (r8728)
+++ trunk/lib/model/om/BaseRightsTermRelation.php Sun Oct 31 20:31:01
2010 (r8729)
@@ -41,7 +41,6 @@
{
$keys = array();
$keys['id'] = $row[6];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$rightsTermRelations[$key]))
Modified: trunk/lib/model/om/BaseSetting.php
==============================================================================
--- trunk/lib/model/om/BaseSetting.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseSetting.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -39,7 +39,6 @@
{
$keys = array();
$keys['id'] = $row[5];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$settings[$key]))
Modified: trunk/lib/model/om/BaseSettingI18n.php
==============================================================================
--- trunk/lib/model/om/BaseSettingI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseSettingI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -32,7 +32,6 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$settingI18ns[$key]))
Modified: trunk/lib/model/om/BaseSlug.php
==============================================================================
--- trunk/lib/model/om/BaseSlug.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseSlug.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -33,7 +33,6 @@
{
$keys = array();
$keys['id'] = $row[2];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$slugs[$key]))
Modified: trunk/lib/model/om/BaseStaticPageI18n.php
==============================================================================
--- trunk/lib/model/om/BaseStaticPageI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseStaticPageI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -34,7 +34,6 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$staticPageI18ns[$key]))
Modified: trunk/lib/model/om/BaseStatus.php
==============================================================================
--- trunk/lib/model/om/BaseStatus.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseStatus.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -39,7 +39,6 @@
{
$keys = array();
$keys['id'] = $row[5];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$statuss[$key]))
Modified: trunk/lib/model/om/BaseSystemEvent.php
==============================================================================
--- trunk/lib/model/om/BaseSystemEvent.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseSystemEvent.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -47,7 +47,6 @@
{
$keys = array();
$keys['id'] = $row[9];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$systemEvents[$key]))
Modified: trunk/lib/model/om/BaseTaxonomyI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomyI18n.php Sun Oct 31 20:11:15 2010
(r8728)
+++ trunk/lib/model/om/BaseTaxonomyI18n.php Sun Oct 31 20:31:01 2010
(r8729)
@@ -34,7 +34,6 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$taxonomyI18ns[$key]))
Modified: trunk/lib/model/om/BaseTermI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTermI18n.php Sun Oct 31 20:11:15 2010 (r8728)
+++ trunk/lib/model/om/BaseTermI18n.php Sun Oct 31 20:31:01 2010 (r8729)
@@ -32,7 +32,6 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$termI18ns[$key]))
Modified: trunk/lib/propel/builder/QubitObjectBuilder.php
==============================================================================
--- trunk/lib/propel/builder/QubitObjectBuilder.php Sun Oct 31 20:11:15
2010 (r8728)
+++ trunk/lib/propel/builder/QubitObjectBuilder.php Sun Oct 31 20:31:01
2010 (r8729)
@@ -371,13 +371,6 @@
\$keys['{$this->getColumnVarName($primaryKey)}'] = \$row[$position];
keys;
}
-
- // The $row array passed to getFromRow is specific to the calling class so
- // make sure we don't cache an incompatible object
- $keys[] = <<<keys
- \$keys['calledClass'] = get_called_class();
-keys;
-
$keys = implode("\n", $keys);
$script .= <<<script
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Sun Oct 31
20:11:15 2010 (r8728)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Sun Oct 31
20:31:01 2010 (r8729)
@@ -41,7 +41,6 @@
{
$keys = array();
$keys['id'] = $row[0];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$aclGroups[$key]))
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Sun Oct 31
20:11:15 2010 (r8728)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Sun Oct 31
20:31:01 2010 (r8729)
@@ -34,7 +34,6 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$aclGroupI18ns[$key]))
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Sun Oct
31 20:11:15 2010 (r8728)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Sun Oct
31 20:31:01 2010 (r8729)
@@ -47,7 +47,6 @@
{
$keys = array();
$keys['id'] = $row[0];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$aclPermissions[$key]))
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Sun Oct 31
20:11:15 2010 (r8728)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Sun Oct 31
20:31:01 2010 (r8729)
@@ -33,7 +33,6 @@
{
$keys = array();
$keys['id'] = $row[0];
- $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$aclUserGroups[$key]))
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
