SCHEMA CHANGE - liberty_content_types - change content_description to content_name, add column content_name_plural - update all class files and hashes where appropriateCVS_HEAD

4 files changed, 13 insertions, 10 deletions

diff --git a/BitNewsletter.php b/BitNewsletter.php
index 70c599f..f551f25 100644
--- a/BitNewsletter.php
+++ b/BitNewsletter.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletter.php,v 1.38 2010/03/03 21:23:32 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletter.php,v 1.39 2010/04/17 22:46:09 wjames5 Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * All Rights Reserved. See below for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details
  *
- * $Id: BitNewsletter.php,v 1.38 2010/03/03 21:23:32 spiderr Exp $
+ * $Id: BitNewsletter.php,v 1.39 2010/04/17 22:46:09 wjames5 Exp $
  *
  * Virtual base class (as much as one can have such things in PHP) for all
  * derived tikiwiki classes that require database access.
@@ -16,7 +16,7 @@
  *
  * @author drewslater <andrew@andrewslater.com>, spiderr <spider@steelsun.com>
  *
- * @version $Revision: 1.38 $ $Date: 2010/03/03 21:23:32 $ $Author: spiderr $
+ * @version $Revision: 1.39 $ $Date: 2010/04/17 22:46:09 $ $Author: wjames5 $
  */
 
 /**
@@ -35,7 +35,7 @@ class BitNewsletter extends LibertyContent {
 		parent::LibertyContent();
 		$this->registerContentType( BITNEWSLETTER_CONTENT_TYPE_GUID, array(
 			'content_type_guid' => BITNEWSLETTER_CONTENT_TYPE_GUID,
-			'content_description' => 'Newsletter',
+			'content_name' => 'Newsletter',
 			'handler_class' => 'BitNewsletter',
 			'handler_package' => 'newsletters',
 			'handler_file' => 'BitNewsletter.php',
diff --git a/BitNewsletterEdition.php b/BitNewsletterEdition.php
index 35882ed..f9b1803 100644
--- a/BitNewsletterEdition.php
+++ b/BitNewsletterEdition.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletterEdition.php,v 1.34 2009/10/01 14:17:02 wjames5 Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletterEdition.php,v 1.35 2010/04/17 22:46:09 wjames5 Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * All Rights Reserved. See below for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details
  *
- * $Id: BitNewsletterEdition.php,v 1.34 2009/10/01 14:17:02 wjames5 Exp $
+ * $Id: BitNewsletterEdition.php,v 1.35 2010/04/17 22:46:09 wjames5 Exp $
  *
  * Class that handles editions of newsletters
  * @package newsletters
@@ -15,7 +15,7 @@
  *
  * @author spiderr <spider@steelsun.com>
  *
- * @version $Revision: 1.34 $ $Date: 2009/10/01 14:17:02 $ $Author: wjames5 $
+ * @version $Revision: 1.35 $ $Date: 2010/04/17 22:46:09 $ $Author: wjames5 $
  */
 
 /**
@@ -34,7 +34,7 @@ class BitNewsletterEdition extends LibertyMime {
 		parent::LibertyContent();
 		$this->registerContentType( BITNEWSLETTEREDITION_CONTENT_TYPE_GUID, array(
 			'content_type_guid' => BITNEWSLETTEREDITION_CONTENT_TYPE_GUID,
-			'content_description' => 'Edition',
+			'content_name' => 'Edition',
 			'handler_class' => 'BitNewsletterEdition',
 			'handler_package' => 'newsletters',
 			'handler_file' => 'BitNewsletterEdition.php',
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index aadc5ce..9f7c05d 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -120,4 +120,7 @@ $gBitInstaller->registerUserPermissions( NEWSLETTERS_PKG_NAME, array(
 	array('p_newsletters_subscribe_email', 'Can subscribe any email to newsletters', 'editors', 'newsletters'),
 ) );
 
-?>
+// Requirements
+$gBitInstaller->registerRequirements( NEWSLETTERS_PKG_NAME, array(
+    'liberty' => array( 'min' => '2.1.4' ),
+));
diff --git a/templates/user_subscriptions.tpl b/templates/user_subscriptions.tpl
index b1c75ae..c7b5926 100644
--- a/templates/user_subscriptions.tpl
+++ b/templates/user_subscriptions.tpl
@@ -15,7 +15,7 @@
 <em>
 			{formlabel label="In Response To"}
 			{forminput}
-				{tr}{$subInfo.content_description}{/tr}: {$subInfo.title|escape}
+				{tr}{$subInfo.content_name}{/tr}: {$subInfo.title|escape}
 			{/forminput}
 </em>
 		</div>