? .svn
? images/.svn
? includes/.cvsignore
? includes/__MACOSX
? includes/example.html
? includes/jquery.cycle.all.min.js
? includes/jquery.cycle.js
? includes/jquery.cycle.lite.min.js
? includes/jquery.easing.js
? includes/src
Index: rotating_banner.admin.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/rotating_banner/rotating_banner.admin.inc,v
retrieving revision 1.29
diff -u -r1.29 rotating_banner.admin.inc
--- rotating_banner.admin.inc	13 Jan 2011 03:47:10 -0000	1.29
+++ rotating_banner.admin.inc	24 Jan 2011 17:11:56 -0000
@@ -67,7 +67,7 @@
 
 $link_text = <<<EOF
 <ul class="action-links">
-  <li><a href="#" class="choose-image-link">Choose background image</a></li>
+  <li><a href="#" class="choose-image-link">Choose banner image</a></li>
   <li class="rb-custom-layout-tools"><a href="#" id="rb-add-headline">Add new banner headline</a></li>
   <li><a href="#" class="rb-custom-layout-tools" id="rb-add-text">Add new text area</a></li>
 
Index: rotating_banner.classes.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/rotating_banner/rotating_banner.classes.inc,v
retrieving revision 1.5
diff -u -r1.5 rotating_banner.classes.inc
--- rotating_banner.classes.inc	20 Oct 2010 17:02:16 -0000	1.5
+++ rotating_banner.classes.inc	24 Jan 2011 17:11:56 -0000
@@ -10,7 +10,7 @@
   public $layout;
   public $textboxes;
 
-  function __construct() {
+  function initialize() {
     if (is_string($this->textboxes)) {
       $this->textboxes = drupal_json_decode($this->textboxes);
     };
@@ -115,16 +115,19 @@
     if (!count($result)) {
       return FALSE;
     }
+    SimpleActiveRecord::runInitialize($result);
     return array_shift($result);
   }
 
   public static function getByRotatingBanner($rbid) {
-    return db_select('rotating_banner_slides', 's')
+    $result = db_select('rotating_banner_slides', 's')
       ->fields('s')
       ->condition('rbid', $rbid)
       ->orderBy('weight')
       ->execute()
       ->fetchAll(PDO::FETCH_CLASS, 'RotatingBannerSlide');
+    SimpleActiveRecord::runInitialize($result);
+    return $result;
   }
 
 }
@@ -139,7 +142,7 @@
     return array('title', 'machine_name', 'settings');
   }
 
-  function __construct() {
+  public function initialize() {
     if (is_string($this->settings)) {
       $this->settings = unserialize($this->settings);
     };
@@ -194,10 +197,11 @@
       ->range(0,1)
       ->execute()
       ->fetchAll(PDO::FETCH_CLASS, 'RotatingBanner');
-
+    
     if (!count($result)) {
       return FALSE;
     }
+    SimpleActiveRecord::runInitialize($result);
     return array_shift($result);
   }
 
@@ -210,6 +214,7 @@
     if (!count($result)) {
       return FALSE;
     }
+    SimpleActiveRecord::runInitialize($result);
     return $result;
   }
 
@@ -259,4 +264,19 @@
       }
     }
   }
+
+  /**
+   * Disclaimer: This is a hack.  The PDO::FETCH_CLASS does not behave as
+   * documented.  It is supposed to run the constructor *after* the properties
+   * have been assigned and in some versions of PHP, it does that.
+   *
+   * However, as of http://bugs.php.net/bug.php?id=46292, it does not.  This method
+   * receives a list of Objects and runs a ->initialize() method on them.  This
+   * is basically another constructor which can be run afterwards.
+   */
+  public static function runInitialize(&$result) {
+    foreach ($result as &$row) {
+      $row->initialize();
+    }
+  }
 }
\ No newline at end of file
Index: rotating_banner.js
===================================================================
RCS file: /cvs/drupal/contributions/modules/rotating_banner/rotating_banner.js,v
retrieving revision 1.12
diff -u -r1.12 rotating_banner.js
--- rotating_banner.js	13 Jan 2011 00:26:54 -0000	1.12
+++ rotating_banner.js	24 Jan 2011 17:11:56 -0000
@@ -6,6 +6,12 @@
 
 /*global jQuery: true Drupal: true window: true */
 
+/*jslint bitwise: true, eqeqeq: true, immed: true, newcap: true, nomen: false,
+ onevar: false, plusplus: false, regexp: true, undef: true, white: true, indent: 2
+ browser: true */
+
+/*global jQuery: true Drupal: true window: true */
+
 (function ($) {
   Drupal.behaviors.rotatingBanner = {
     attach: function (context) {
Index: rotating_banner.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/rotating_banner/rotating_banner.module,v
retrieving revision 1.73
diff -u -r1.73 rotating_banner.module
--- rotating_banner.module	13 Jan 2011 03:43:45 -0000	1.73
+++ rotating_banner.module	24 Jan 2011 17:11:56 -0000
@@ -581,6 +581,7 @@
   $textbox_output = '';
   if ($textboxes) {
     foreach ($textboxes as $textbox) {
+      $textbox['layout'] = $layout;
       $textbox['link'] = $link;
       $textbox_output .= theme('rotating_banner_slide_textbox', $textbox);
     }