Skip to content

Instantly share code, notes, and snippets.

@elbouillon
Created March 31, 2010 16:23
Show Gist options
  • Save elbouillon/350528 to your computer and use it in GitHub Desktop.
Save elbouillon/350528 to your computer and use it in GitHub Desktop.
diff --git a/dmCorePlugin/lib/doctrine/extension/DmGallery/DmGallery.php b/dmCorePlugin/lib/doctrine/extension/DmGallery/DmGallery.php
index 24b2a3e..3b5c1d9 100755
--- a/dmCorePlugin/lib/doctrine/extension/DmGallery/DmGallery.php
+++ b/dmCorePlugin/lib/doctrine/extension/DmGallery/DmGallery.php
@@ -18,7 +18,15 @@ class Doctrine_DmGallery extends Doctrine_Record_Generator
$this->hasColumn('dm_media_id', 'integer', null, array('notnull' => true));
- $this->hasColumn('dm_record_id', 'integer', null, array('notnull' => true));
+ $identifier = $this->_options['table']->getIdentifier();
+ if(is_array($identifier))
+ {
+ throw new DmException('DmGallery work with unique identifier tables only');
+ }
+ $identifier_definition = $this->_options['table']->getColumnDefinition($identifier);
+ $unsigned = isset($identifier_definition['unsigned']) ? $identifier_definition['unsigned'] : false;
+
+ $this->hasColumn('dm_record_id', $identifier_definition['type'], $identifier_definition['length'], array('notnull' => true, 'unsigned' => $unsigned));
$this->hasColumn('position', 'integer');
@@ -62,4 +70,4 @@ class Doctrine_DmGallery extends Doctrine_Record_Generator
public function setUp()
{
}
-}
\ No newline at end of file
+}
diff --git a/dmCorePlugin/plugins/sfImageTransformPlugin b/dmCorePlugin/plugins/sfImageTransformPlugin
index 693a693..646729a 160000
--- a/dmCorePlugin/plugins/sfImageTransformPlugin
+++ b/dmCorePlugin/plugins/sfImageTransformPlugin
@@ -1 +1 @@
-Subproject commit 693a6934e37bc9dbf2b0d996d2bd9eadcc77decd
+Subproject commit 646729a961652d1e3e9cfa039565759acb802f1e
diff --git a/symfony b/symfony
index c0d5c76..f4b3bc4 160000
--- a/symfony
+++ b/symfony
@@ -1 +1 @@
-Subproject commit c0d5c76e761fdbab70520e03ff2af0fbf4e70a68
+Subproject commit f4b3bc40b3e97de23fe29397947bd700613f895b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment