Author: jablko
Date: Thu Nov 12 16:43:55 2009
New Revision: 3891
Log:
Never escape comments in heredocs. Only worked because
propel.builder.addComments is disabled and in PHP 5.2 token_get_all() converts
'\/' to '/'. Fixed in PHP 5.3. Fixes issue 1126
Modified:
trunk/lib/model/om/BaseActorI18n.php
trunk/lib/model/om/BaseActorName.php
trunk/lib/model/om/BaseActorNameI18n.php
trunk/lib/model/om/BaseContactInformation.php
trunk/lib/model/om/BaseContactInformationI18n.php
trunk/lib/model/om/BaseDigitalObject.php
trunk/lib/model/om/BaseEventI18n.php
trunk/lib/model/om/BaseFunctionI18n.php
trunk/lib/model/om/BaseInformationObject.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/BasePermission.php
trunk/lib/model/om/BasePermissionScope.php
trunk/lib/model/om/BasePhysicalObject.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/BaseRole.php
trunk/lib/model/om/BaseRolePermissionRelation.php
trunk/lib/model/om/BaseSetting.php
trunk/lib/model/om/BaseSettingI18n.php
trunk/lib/model/om/BaseStaticPageI18n.php
trunk/lib/model/om/BaseStatus.php
trunk/lib/model/om/BaseSystemEvent.php
trunk/lib/model/om/BaseTaxonomy.php
trunk/lib/model/om/BaseTaxonomyI18n.php
trunk/lib/model/om/BaseTerm.php
trunk/lib/model/om/BaseTermI18n.php
trunk/lib/model/om/BaseUser.php
trunk/lib/model/om/BaseUserRoleRelation.php
trunk/lib/propel/builder/QubitObjectBuilder.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclAction.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclActionI18n.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
Modified: trunk/lib/model/om/BaseActorI18n.php
==============================================================================
--- trunk/lib/model/om/BaseActorI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseActorI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -411,9 +411,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseActorName.php
==============================================================================
--- trunk/lib/model/om/BaseActorName.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseActorName.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -462,9 +462,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseActorNameI18n.php
==============================================================================
--- trunk/lib/model/om/BaseActorNameI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseActorNameI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -389,9 +389,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseContactInformation.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformation.php Thu Nov 12 00:05:35
2009 (r3890)
+++ trunk/lib/model/om/BaseContactInformation.php Thu Nov 12 16:43:55
2009 (r3891)
@@ -482,9 +482,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseContactInformationI18n.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformationI18n.php Thu Nov 12 00:05:35
2009 (r3890)
+++ trunk/lib/model/om/BaseContactInformationI18n.php Thu Nov 12 16:43:55
2009 (r3891)
@@ -393,9 +393,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseDigitalObject.php
==============================================================================
--- trunk/lib/model/om/BaseDigitalObject.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseDigitalObject.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -246,11 +246,9 @@
protected function update($connection = null)
{
- // Update nested set keys only if parent id has changed
- if (isset($this->values['parentId']))
+ if (isset($this->values['parentId']))
{
- // Get the "original" parentId before any updates
- $offset = 0;
+ $offset = 0;
$originalParentId = null;
foreach ($this->tables as $table)
{
@@ -265,9 +263,7 @@
}
}
- // If updated value of parentId is different then original value,
- // update the nested set
- if ($originalParentId != $this->values['parentId'])
+ if ($originalParentId != $this->values['parentId'])
{
$this->updateNestedSet($connection);
}
Modified: trunk/lib/model/om/BaseEventI18n.php
==============================================================================
--- trunk/lib/model/om/BaseEventI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseEventI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -391,9 +391,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseFunctionI18n.php
==============================================================================
--- trunk/lib/model/om/BaseFunctionI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseFunctionI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -405,9 +405,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseInformationObject.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObject.php Thu Nov 12 00:05:35
2009 (r3890)
+++ trunk/lib/model/om/BaseInformationObject.php Thu Nov 12 16:43:55
2009 (r3891)
@@ -378,11 +378,9 @@
protected function update($connection = null)
{
- // Update nested set keys only if parent id has changed
- if (isset($this->values['parentId']))
+ if (isset($this->values['parentId']))
{
- // Get the "original" parentId before any updates
- $offset = 0;
+ $offset = 0;
$originalParentId = null;
foreach ($this->tables as $table)
{
@@ -397,9 +395,7 @@
}
}
- // If updated value of parentId is different then original value,
- // update the nested set
- if ($originalParentId != $this->values['parentId'])
+ if ($originalParentId != $this->values['parentId'])
{
$this->updateNestedSet($connection);
}
Modified: trunk/lib/model/om/BaseInformationObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObjectI18n.php Thu Nov 12 00:05:35
2009 (r3890)
+++ trunk/lib/model/om/BaseInformationObjectI18n.php Thu Nov 12 16:43:55
2009 (r3891)
@@ -427,9 +427,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseMap.php
==============================================================================
--- trunk/lib/model/om/BaseMap.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseMap.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -480,9 +480,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseMapI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMapI18n.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseMapI18n.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -389,9 +389,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseMenu.php
==============================================================================
--- trunk/lib/model/om/BaseMenu.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseMenu.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -559,9 +559,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
@@ -574,11 +572,9 @@
protected function update($connection = null)
{
- // Update nested set keys only if parent id has changed
- if (isset($this->values['parentId']))
+ if (isset($this->values['parentId']))
{
- // Get the "original" parentId before any updates
- $offset = 0;
+ $offset = 0;
$originalParentId = null;
foreach ($this->tables as $table)
{
@@ -593,9 +589,7 @@
}
}
- // If updated value of parentId is different then original value,
- // update the nested set
- if ($originalParentId != $this->values['parentId'])
+ if ($originalParentId != $this->values['parentId'])
{
$this->updateNestedSet($connection);
}
Modified: trunk/lib/model/om/BaseMenuI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMenuI18n.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseMenuI18n.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -389,9 +389,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseNote.php
==============================================================================
--- trunk/lib/model/om/BaseNote.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseNote.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -563,9 +563,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
@@ -578,11 +576,9 @@
protected function update($connection = null)
{
- // Update nested set keys only if parent id has changed
- if (isset($this->values['parentId']))
+ if (isset($this->values['parentId']))
{
- // Get the "original" parentId before any updates
- $offset = 0;
+ $offset = 0;
$originalParentId = null;
foreach ($this->tables as $table)
{
@@ -597,9 +593,7 @@
}
}
- // If updated value of parentId is different then original value,
- // update the nested set
- if ($originalParentId != $this->values['parentId'])
+ if ($originalParentId != $this->values['parentId'])
{
$this->updateNestedSet($connection);
}
Modified: trunk/lib/model/om/BaseNoteI18n.php
==============================================================================
--- trunk/lib/model/om/BaseNoteI18n.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseNoteI18n.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -387,9 +387,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseOaiHarvest.php
==============================================================================
--- trunk/lib/model/om/BaseOaiHarvest.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseOaiHarvest.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -396,9 +396,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseOaiRepository.php
==============================================================================
--- trunk/lib/model/om/BaseOaiRepository.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseOaiRepository.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -414,9 +414,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseObject.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -180,11 +180,6 @@
}
}
- if ('aclPermissions' == $name)
- {
- return true;
- }
-
if ('notes' == $name)
{
return true;
@@ -220,6 +215,11 @@
return true;
}
+ if ('aclPermissions' == $name)
+ {
+ return true;
+ }
+
throw new sfException('Unknown record property "'.$name.'" on
"'.get_class($this).'"');
}
@@ -261,23 +261,6 @@
}
}
- if ('aclPermissions' == $name)
- {
- if (!isset($this->refFkValues['aclPermissions']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['aclPermissions'];
- }
-
if ('notes' == $name)
{
if (!isset($this->refFkValues['notes']))
@@ -397,6 +380,23 @@
return $this->refFkValues['statuss'];
}
+ if ('aclPermissions' == $name)
+ {
+ if (!isset($this->refFkValues['aclPermissions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['aclPermissions'];
+ }
+
throw new sfException('Unknown record property "'.$name.'" on
"'.get_class($this).'"');
}
@@ -564,9 +564,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
@@ -655,26 +653,6 @@
$this->setid($key);
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclPermission::OBJECT_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclPermissionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
-
- return QubitAclPermission::get($criteria, $options);
- }
-
- public function addaclPermissionsCriteria(Criteria $criteria)
- {
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
- }
-
public static function addnotesCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitNote::OBJECT_ID, $id);
@@ -815,6 +793,26 @@
return self::addstatussCriteriaById($criteria, $this->id);
}
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclPermission::OBJECT_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclPermissionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclPermissionsCriteriaById($criteria, $id);
+
+ return QubitAclPermission::get($criteria, $options);
+ }
+
+ public function addaclPermissionsCriteria(Criteria $criteria)
+ {
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ }
+
public function __call($name, $args)
{
if ('get' == substr($name, 0, 3) || 'set' == substr($name, 0, 3))
Modified: trunk/lib/model/om/BasePermission.php
==============================================================================
--- trunk/lib/model/om/BasePermission.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BasePermission.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -428,9 +428,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BasePermissionScope.php
==============================================================================
--- trunk/lib/model/om/BasePermissionScope.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BasePermissionScope.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -390,9 +390,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BasePhysicalObject.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObject.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BasePhysicalObject.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -320,11 +320,9 @@
protected function update($connection = null)
{
- // Update nested set keys only if parent id has changed
- if (isset($this->values['parentId']))
+ if (isset($this->values['parentId']))
{
- // Get the "original" parentId before any updates
- $offset = 0;
+ $offset = 0;
$originalParentId = null;
foreach ($this->tables as $table)
{
@@ -339,9 +337,7 @@
}
}
- // If updated value of parentId is different then original value,
- // update the nested set
- if ($originalParentId != $this->values['parentId'])
+ if ($originalParentId != $this->values['parentId'])
{
$this->updateNestedSet($connection);
}
Modified: trunk/lib/model/om/BasePhysicalObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObjectI18n.php Thu Nov 12 00:05:35
2009 (r3890)
+++ trunk/lib/model/om/BasePhysicalObjectI18n.php Thu Nov 12 16:43:55
2009 (r3891)
@@ -391,9 +391,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BasePlaceI18n.php
==============================================================================
--- trunk/lib/model/om/BasePlaceI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BasePlaceI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -393,9 +393,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseProperty.php
==============================================================================
--- trunk/lib/model/om/BaseProperty.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseProperty.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -464,9 +464,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BasePropertyI18n.php
==============================================================================
--- trunk/lib/model/om/BasePropertyI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BasePropertyI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -387,9 +387,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseRepositoryI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRepositoryI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseRepositoryI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -415,9 +415,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseRights.php
==============================================================================
--- trunk/lib/model/om/BaseRights.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseRights.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -506,9 +506,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseRightsI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -387,9 +387,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseRightsTermRelation.php
==============================================================================
--- trunk/lib/model/om/BaseRightsTermRelation.php Thu Nov 12 00:05:35
2009 (r3890)
+++ trunk/lib/model/om/BaseRightsTermRelation.php Thu Nov 12 16:43:55
2009 (r3891)
@@ -392,9 +392,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseRole.php
==============================================================================
--- trunk/lib/model/om/BaseRole.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseRole.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -448,9 +448,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseRolePermissionRelation.php
==============================================================================
--- trunk/lib/model/om/BaseRolePermissionRelation.php Thu Nov 12 00:05:35
2009 (r3890)
+++ trunk/lib/model/om/BaseRolePermissionRelation.php Thu Nov 12 16:43:55
2009 (r3891)
@@ -384,9 +384,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseSetting.php
==============================================================================
--- trunk/lib/model/om/BaseSetting.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseSetting.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -462,9 +462,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseSettingI18n.php
==============================================================================
--- trunk/lib/model/om/BaseSettingI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseSettingI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -387,9 +387,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseStaticPageI18n.php
==============================================================================
--- trunk/lib/model/om/BaseStaticPageI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseStaticPageI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -389,9 +389,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseStatus.php
==============================================================================
--- trunk/lib/model/om/BaseStatus.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseStatus.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -390,9 +390,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseSystemEvent.php
==============================================================================
--- trunk/lib/model/om/BaseSystemEvent.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseSystemEvent.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -398,9 +398,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseTaxonomy.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomy.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseTaxonomy.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -482,9 +482,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseTaxonomyI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomyI18n.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseTaxonomyI18n.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -389,9 +389,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseTerm.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -1048,11 +1048,9 @@
protected function update($connection = null)
{
- // Update nested set keys only if parent id has changed
- if (isset($this->values['parentId']))
+ if (isset($this->values['parentId']))
{
- // Get the "original" parentId before any updates
- $offset = 0;
+ $offset = 0;
$originalParentId = null;
foreach ($this->tables as $table)
{
@@ -1067,9 +1065,7 @@
}
}
- // If updated value of parentId is different then original value,
- // update the nested set
- if ($originalParentId != $this->values['parentId'])
+ if ($originalParentId != $this->values['parentId'])
{
$this->updateNestedSet($connection);
}
Modified: trunk/lib/model/om/BaseTermI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTermI18n.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseTermI18n.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -387,9 +387,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/model/om/BaseUser.php
==============================================================================
--- trunk/lib/model/om/BaseUser.php Thu Nov 12 00:05:35 2009 (r3890)
+++ trunk/lib/model/om/BaseUser.php Thu Nov 12 16:43:55 2009 (r3891)
@@ -82,32 +82,32 @@
{
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
return true;
}
- if ('aclUserGroups' == $name)
+ if ('permissionScopes' == $name)
{
return true;
}
- if ('notes' == $name)
+ if ('systemEvents' == $name)
{
return true;
}
- if ('permissionScopes' == $name)
+ if ('userRoleRelations' == $name)
{
return true;
}
- if ('systemEvents' == $name)
+ if ('aclPermissions' == $name)
{
return true;
}
- if ('userRoleRelations' == $name)
+ if ('aclUserGroups' == $name)
{
return true;
}
@@ -133,151 +133,111 @@
{
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
- if (!isset($this->refFkValues['aclPermissions']))
+ if (!isset($this->refFkValues['notes']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ $this->refFkValues['notes'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclPermissions'];
+ return $this->refFkValues['notes'];
}
- if ('aclUserGroups' == $name)
+ if ('permissionScopes' == $name)
{
- if (!isset($this->refFkValues['aclUserGroups']))
+ if (!isset($this->refFkValues['permissionScopes']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclUserGroups'] = QubitQuery::create();
+ $this->refFkValues['permissionScopes'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['permissionScopes'] =
self::getpermissionScopesById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclUserGroups'];
+ return $this->refFkValues['permissionScopes'];
}
- if ('notes' == $name)
+ if ('systemEvents' == $name)
{
- if (!isset($this->refFkValues['notes']))
+ if (!isset($this->refFkValues['systemEvents']))
{
if (!isset($this->id))
{
- $this->refFkValues['notes'] = QubitQuery::create();
+ $this->refFkValues['systemEvents'] = QubitQuery::create();
}
else
{
- $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
+ $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['notes'];
+ return $this->refFkValues['systemEvents'];
}
- if ('permissionScopes' == $name)
+ if ('userRoleRelations' == $name)
{
- if (!isset($this->refFkValues['permissionScopes']))
+ if (!isset($this->refFkValues['userRoleRelations']))
{
if (!isset($this->id))
{
- $this->refFkValues['permissionScopes'] = QubitQuery::create();
+ $this->refFkValues['userRoleRelations'] = QubitQuery::create();
}
else
{
- $this->refFkValues['permissionScopes'] =
self::getpermissionScopesById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['userRoleRelations'] =
self::getuserRoleRelationsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['permissionScopes'];
+ return $this->refFkValues['userRoleRelations'];
}
- if ('systemEvents' == $name)
+ if ('aclPermissions' == $name)
{
- if (!isset($this->refFkValues['systemEvents']))
+ if (!isset($this->refFkValues['aclPermissions']))
{
if (!isset($this->id))
{
- $this->refFkValues['systemEvents'] = QubitQuery::create();
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
}
else
{
- $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['systemEvents'];
+ return $this->refFkValues['aclPermissions'];
}
- if ('userRoleRelations' == $name)
+ if ('aclUserGroups' == $name)
{
- if (!isset($this->refFkValues['userRoleRelations']))
+ if (!isset($this->refFkValues['aclUserGroups']))
{
if (!isset($this->id))
{
- $this->refFkValues['userRoleRelations'] = QubitQuery::create();
+ $this->refFkValues['aclUserGroups'] = QubitQuery::create();
}
else
{
- $this->refFkValues['userRoleRelations'] =
self::getuserRoleRelationsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['userRoleRelations'];
+ return $this->refFkValues['aclUserGroups'];
}
throw new sfException('Unknown record property "'.$name.'" on
"'.get_class($this).'"');
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclPermission::USER_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclPermissionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
-
- return QubitAclPermission::get($criteria, $options);
- }
-
- public function addaclPermissionsCriteria(Criteria $criteria)
- {
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
- }
-
- public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclUserGroup::USER_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclUserGroupsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclUserGroupsCriteriaById($criteria, $id);
-
- return QubitAclUserGroup::get($criteria, $options);
- }
-
- public function addaclUserGroupsCriteria(Criteria $criteria)
- {
- return self::addaclUserGroupsCriteriaById($criteria, $this->id);
- }
-
public static function addnotesCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitNote::USER_ID, $id);
@@ -357,4 +317,44 @@
{
return self::adduserRoleRelationsCriteriaById($criteria, $this->id);
}
+
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclPermission::USER_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclPermissionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclPermissionsCriteriaById($criteria, $id);
+
+ return QubitAclPermission::get($criteria, $options);
+ }
+
+ public function addaclPermissionsCriteria(Criteria $criteria)
+ {
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ }
+
+ public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclUserGroup::USER_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclUserGroupsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclUserGroupsCriteriaById($criteria, $id);
+
+ return QubitAclUserGroup::get($criteria, $options);
+ }
+
+ public function addaclUserGroupsCriteria(Criteria $criteria)
+ {
+ return self::addaclUserGroupsCriteriaById($criteria, $this->id);
+ }
}
Modified: trunk/lib/model/om/BaseUserRoleRelation.php
==============================================================================
--- trunk/lib/model/om/BaseUserRoleRelation.php Thu Nov 12 00:05:35 2009
(r3890)
+++ trunk/lib/model/om/BaseUserRoleRelation.php Thu Nov 12 16:43:55 2009
(r3891)
@@ -384,9 +384,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/lib/propel/builder/QubitObjectBuilder.php
==============================================================================
--- trunk/lib/propel/builder/QubitObjectBuilder.php Thu Nov 12 00:05:35
2009 (r3890)
+++ trunk/lib/propel/builder/QubitObjectBuilder.php Thu Nov 12 16:43:55
2009 (r3891)
@@ -1439,8 +1439,8 @@
if (null !== \$id = $this->basePeerClassName::doInsert(\$criteria,
\$connection))
{
- \/\/ Guess that the first primary key of the first table is auto
- \/\/ incremented
+ // Guess that the first primary key of the first table is auto
+ // incremented
if (\$this->tables[0] == \$table)
{
\$columns = \$table->getPrimaryKeyColumns();
@@ -1478,10 +1478,10 @@
{
$script .= <<<EOF
- \/\/ Update nested set keys only if parent id has changed
+ // Update nested set keys only if parent id has changed
if (isset(\$this->values['parentId']))
{
- \/\/ Get the "original" parentId before any updates
+ // Get the "original" parentId before any updates
\$offset = 0;
\$originalParentId = null;
foreach (\$this->tables as \$table)
@@ -1497,8 +1497,8 @@
}
}
- \/\/ If updated value of parentId is different then original value,
- \/\/ update the nested set
+ // If updated value of parentId is different then original value,
+ // update the nested set
if (\$originalParentId != \$this->values['parentId'])
{
\$this->updateNestedSet(\$connection);
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclAction.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclAction.php Thu Nov 12
00:05:35 2009 (r3890)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclAction.php Thu Nov 12
16:43:55 2009 (r3891)
@@ -476,9 +476,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclActionI18n.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclActionI18n.php Thu Nov
12 00:05:35 2009 (r3890)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclActionI18n.php Thu Nov
12 16:43:55 2009 (r3891)
@@ -389,9 +389,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Thu Nov 12
00:05:35 2009 (r3890)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Thu Nov 12
16:43:55 2009 (r3891)
@@ -599,9 +599,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
@@ -614,11 +612,9 @@
protected function update($connection = null)
{
- // Update nested set keys only if parent id has changed
- if (isset($this->values['parentId']))
+ if (isset($this->values['parentId']))
{
- // Get the "original" parentId before any updates
- $offset = 0;
+ $offset = 0;
$originalParentId = null;
foreach ($this->tables as $table)
{
@@ -633,9 +629,7 @@
}
}
- // If updated value of parentId is different then original value,
- // update the nested set
- if ($originalParentId != $this->values['parentId'])
+ if ($originalParentId != $this->values['parentId'])
{
$this->updateNestedSet($connection);
}
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Thu Nov 12
00:05:35 2009 (r3890)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Thu Nov 12
16:43:55 2009 (r3891)
@@ -389,9 +389,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Thu Nov
12 00:05:35 2009 (r3890)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Thu Nov
12 16:43:55 2009 (r3891)
@@ -398,9 +398,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Thu Nov 12
00:05:35 2009 (r3890)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Thu Nov 12
16:43:55 2009 (r3891)
@@ -384,9 +384,7 @@
if (null !== $id = BasePeer::doInsert($criteria, $connection))
{
- // Guess that the first primary key of the first table is auto
- // incremented
- if ($this->tables[0] == $table)
+ if ($this->tables[0] == $table)
{
$columns = $table->getPrimaryKeyColumns();
$this->values[$columns[0]->getPhpName()] = $id;
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
