Merge pull request #4 from bzerangue/master

updated for Symphony 2.3
symphonists · Aug 16, 2013 · b8cfdf5 · b8cfdf5
2 parents b519b28 + f4f29ff
commit b8cfdf5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/extension.driver.php b/extension.driver.php
@@ -8,23 +8,6 @@
 	 * A field that generates, stores and filters repeating dates.
 	 */
 	class Extension_Repeating_Date_Field extends Extension {
-		/**
-		 * Extension information.
-		 */
-		public function about() {
-			return array(
-				'name'			=> 'Field: Repeating Date',
-				'version'		=> '1.1',
-				'release-date'	=> '2011-09-13',
-				'author'		=> array(
-					'name'			=> 'Rowan Lewis',
-					'website'		=> 'http://rowanlewis.com/',
-					'email'			=> 'me@rowanlewis.com'
-				),
-				'description'	=> 'A field that generates, stores and filters repeating dates.'
-			);
-		}
-
 		/**
 		 * Cleanup installation.
 		 */
@@ -43,7 +26,7 @@ public function install() {
 					`pre_populate` enum('yes','no') NOT NULL default 'no',
 					PRIMARY KEY (`id`),
 					KEY `field_id` (`field_id`)
-				)
+				) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 			");
 		}
 

diff --git a/extension.meta.xml b/extension.meta.xml
@@ -17,6 +17,11 @@
 		</author>
 	</authors>
 	<releases>
-		<release version="1.1" date="2011-09-13" min="2.0" />
+		<release version="1.2" date="2013-08-13" min="2.3">
+			- Added Symphony 2.3 compability.
+		</release>
+		<release version="1.1" date="2011-09-13" min="2.0">
+			- For Symphony 2.2.x and lower...
+		</release>
 	</releases>
 </extension>
diff --git a/fields/field.repeating_date.php b/fields/field.repeating_date.php
@@ -11,8 +11,8 @@ class FieldRepeating_Date extends Field {
 		protected $_driver = null;
 		protected $filter = 0;
 
-		public function __construct(&$parent) {
-			parent::__construct($parent);
+		public function __construct() {
+			parent::__construct();
 
 			$this->_name = 'Repeating Date';
 			$this->_driver = Symphony::ExtensionManager()->create('repeating_date_field');
@@ -329,7 +329,7 @@ protected function displayPublishMode($wrapper, $data, $prefix = null, $suffix =
 			$units = @((integer)$data['units'] > 0 ? (integer)$data['units'] : 1);
 
 			$input = Widget::Input(
-				"fields{$prefix}[{$name}][units]{$suffix}", $units
+				"fields{$prefix}[{$name}][units]{$suffix}", (string)$units
 			);
 			$input->setAttribute('size', '2');
 
@@ -502,7 +502,7 @@ public function prepareTableValue($data, XMLElement $link = null) {
 		 * @return array
 		 *	the processed field data.
 		 */
-		public function processRawFieldData($data, &$status, $simulate = false, $entry_id = null) {
+		public function processRawFieldData($data, &$status, &$message=null, $simulate = false, $entry_id = null) {
 			$status = self::__OK__;
 			$data = array_merge(array(
 				'start'		=> null,