Changeset 4471

Timestamp:

01/13/12 17:18:05 (4 months ago)

Author:

tboutell

Message:

* aMediaItemTable::getEmbedCode now accepts an 'alt' option that overrides the use of the media item's title as the alt attribute
* Button slots use it

Location:

plugins/apostrophePlugin/branches/1.5/lib

Files:

• action/BaseaButtonSlotComponents.class.php (modified) (1 diff)
• model/doctrine/PluginaMediaItem.class.php (modified) (1 diff)

plugins/apostrophePlugin/branches/1.5/lib/action/BaseaButtonSlotComponents.class.php

@@ -44 +44 @@
           "height" => $this->options['flexHeight'] ? false : $this->options['height'],
           "resizeType" => $this->options['resizeType']));
-      $this->embed = $this->item->getEmbedCode($this->dimensions['width'], $this->dimensions['height'], $this->dimensions['resizeType'], $this->dimensions['format'], false);
+      $this->embed = $this->item->getEmbedCode($this->dimensions['width'], $this->dimensions['height'], $this->dimensions['resizeType'], $this->dimensions['format'], false, 'opaque', false, array('alt' => strlen($this->options['title']) ? $this->options['title'] : ''));
     }
   }

plugins/apostrophePlugin/branches/1.5/lib/model/doctrine/PluginaMediaItem.class.php

@@ -303 +303 @@
 
     // Accessible alt title
-    $title = htmlentities($this->getTitle(), ENT_COMPAT, 'UTF-8');
+    if (isset($options['alt']))
+    {
+      $title = aHtml::entities($options['alt']);
+    }
+    else
+    {
+      $title = aHtml::entities($this->getTitle());
+    }
     if ($this->getEmbeddable())
     {