Author: Jonathan.Wage
Date: 2010-01-17 01:56:50 +0100 (Sun, 17 Jan 2010)
New Revision: 26744

Modified:
   plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
   
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
   
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/config/sfSympalAssetsPluginConfiguration.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing asset replacement for rss feeds


Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php       
2010-01-16 23:13:45 UTC (rev 26743)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php       
2010-01-17 00:56:50 UTC (rev 26744)
@@ -101,7 +101,7 @@
     $this->initializeTheme();
 
     $this->_projectConfiguration->loadHelpers(array(
-      'Sympal', 'SympalContentSlot', 'SympalMenu', 'SympalPager', 'I18N'
+      'Sympal', 'SympalContentSlot', 'SympalMenu', 'SympalPager', 'I18N', 
'Asset'
     ));
   }
 

Modified: 
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
--- 
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php 
    2010-01-16 23:13:45 UTC (rev 26743)
+++ 
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php 
    2010-01-17 00:56:50 UTC (rev 26744)
@@ -310,17 +310,23 @@
       return $this->getRecord()->getFeedDescription();
     }
 
-    foreach ($this->getFeedDescriptionPotentialSlots() as $slot)
+    foreach ($this->getFeedDescriptionPotentialSlots() as $slotName)
     {
-      if ($this->hasSlot($slot))
+      if ($this->hasSlot($slotName))
       {
-        return $this->getSlot($slot)->render();
+        $slot = $this->getSlot($slotName);
+        break;
       }
     }
+
     if ($this->Slots->count() > 0)
     {
-      return $this->Slots->getFirst()->render();
+      $slot = $this->Slots->getFirst();
     }
+
+    $slot->setContentRenderedFor($this);
+
+    return $slot->render();
   }
 
   public function getFormatData($format)

Modified: 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/config/sfSympalAssetsPluginConfiguration.class.php
===================================================================
--- 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/config/sfSympalAssetsPluginConfiguration.class.php
    2010-01-16 23:13:45 UTC (rev 26743)
+++ 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/config/sfSympalAssetsPluginConfiguration.class.php
    2010-01-17 00:56:50 UTC (rev 26744)
@@ -1,6 +1,6 @@
 <?php
 
-class sfSympalAssetsPluginConfiguration extends sfSympalPluginConfiguration
+class sfSympalAssetsPluginConfiguration extends sfPluginConfiguration
 {
   public function initialize()
   {
@@ -19,6 +19,5 @@
   public function loadConfigForm(sfEvent $event)
   {
     $form = $event->getSubject();
-
   }
 }
\ No newline at end of file

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.


Reply via email to