diff options
| author | wjames5 <will@tekimaki.com> | 2010-04-17 22:46:08 +0000 |
|---|---|---|
| committer | wjames5 <will@tekimaki.com> | 2010-04-17 22:46:08 +0000 |
| commit | 90346a3c1965d8e5b24b51dbb00c027d107fb96a (patch) | |
| tree | 7153dd0d89eeaeef881e18179cb936c4c3a06b08 | |
| parent | 84075df37b8a79a755477d0e5329b8fe8a667377 (diff) | |
| download | fisheye-90346a3c1965d8e5b24b51dbb00c027d107fb96a.tar.gz fisheye-90346a3c1965d8e5b24b51dbb00c027d107fb96a.tar.bz2 fisheye-90346a3c1965d8e5b24b51dbb00c027d107fb96a.zip | |
SCHEMA CHANGE - liberty_content_types - change content_description to content_name, add column content_name_plural - update all class files and hashes where appropriate
| -rw-r--r-- | FisheyeGallery.php | 5 | ||||
| -rw-r--r-- | FisheyeImage.php | 7 | ||||
| -rw-r--r-- | admin/schema_inc.php | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/FisheyeGallery.php b/FisheyeGallery.php index 1b84a4c..6096d90 100644 --- a/FisheyeGallery.php +++ b/FisheyeGallery.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.99 2010/03/16 03:55:10 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.100 2010/04/17 22:46:08 wjames5 Exp $ * @package fisheye */ @@ -37,7 +37,8 @@ class FisheyeGallery extends FisheyeBase { // FYI: Any class which uses a table which inherits from liberty_content should create their own content type(s) $this->registerContentType( FISHEYEGALLERY_CONTENT_TYPE_GUID, array( 'content_type_guid' => FISHEYEGALLERY_CONTENT_TYPE_GUID, - 'content_description' => 'Image Gallery', + 'content_name' => 'Image Gallery', + 'content_name_plural' => 'Image Galleries', 'handler_class' => 'FisheyeGallery', 'handler_package' => 'fisheye', 'handler_file' => 'FisheyeGallery.php', diff --git a/FisheyeImage.php b/FisheyeImage.php index f99770b..00534e6 100644 --- a/FisheyeImage.php +++ b/FisheyeImage.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.113 2010/04/14 19:43:51 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.114 2010/04/17 22:46:08 wjames5 Exp $ * @package fisheye */ @@ -26,7 +26,7 @@ class FisheyeImage extends FisheyeBase { $this->registerContentType( FISHEYEIMAGE_CONTENT_TYPE_GUID, array( 'content_type_guid' => FISHEYEIMAGE_CONTENT_TYPE_GUID, - 'content_description' => 'Image', + 'content_name' => 'Image', 'handler_class' => 'FisheyeImage', 'handler_package' => 'fisheye', 'handler_file' => 'FisheyeImage.php', @@ -658,7 +658,8 @@ class FisheyeImage extends FisheyeBase { if( !empty( $storage['filename'] ) ) { $ret = $storage['filename']; } else { - $ret = tra( $this->getContentTypeDescription( $pHash['content_type_guid'] ) ); + global $gLibertySystem; + $ret = $gLibertySystem->getContentTypeName( $pHash['content_type_guid'] ); if( !empty( $pHash['image_id'] ) ) { $ret .= " ".$pHash['image_id']; } diff --git a/admin/schema_inc.php b/admin/schema_inc.php index c7a7e34..812bcd8 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -100,4 +100,9 @@ $gBitInstaller->registerContentObjects( FISHEYE_PKG_NAME, array( 'FisheyeGallery'=>FISHEYE_PKG_PATH.'FisheyeGallery.php', 'FisheyeImage'=>FISHEYE_PKG_PATH.'FisheyeImage.php', )); -?> + +// Requirements +$gBitInstaller->registerRequirements( FISHEYE_PKG_NAME, array( + 'liberty' => array( 'min' => '2.1.4' ), +)); + |