Changeset 8372

Timestamp:

04/09/08 15:32:39 (5 months ago)

Author:

fabien

Message:

added an optional second argument to slot() for simple slots

The most obvious example is when you define a slot for the page title.
Before, you had to type something like this:

<?php slot('title') ?>The title<?php end_slot() ?>

Now, you can just type:

<?php slot('title', 'The title') ?>

Files:

• branches/1.1/lib/helper/PartialHelper.php (modified) (2 diffs)

branches/1.1/lib/helper/PartialHelper.php

@@ -187 +187 @@
- *
- * @param  string slot name
+ * @param  string The slot content
- *
- * @see    end_slot
- */
-
+, $value = null
-{
-  $context = sfContext::getInstance();
@@ -201 +202 @@
-  }
-
+  if (sfConfig::get('sf_logging_enabled'))
+  {
+    $context->getEventDispatcher()->notify(new sfEvent(null, 'application.log', array(sprintf('Set slot "%s"', $name))));
+  }
+
+  if (!is_null($value))
+  {
+    $response->setSlot($name, $value);
+
+    return;
+  }
+
-  $slot_names[] = $name;
-
-  $response->setSlot($name, '');
-  sfConfig::set('symfony.view.slot_names', $slot_names);
-
-  if (sfConfig::get('sf_logging_enabled'))
-  {
-    $context->getEventDispatcher()->notify(new sfEvent(null, 'application.log', array(sprintf('Set slot "%s"', $name))));
-  }
-
-  ob_start();