? 215927-improve-exposed-form-in-block.patch
? 696402-context-node-form.patch
? 713526-panels-stacked-tpl-conditions.patch
? 718368-ignore-query-string.patch
? 812744-query-string-still-there.patch
? 827310-hide-disabled-comments.patch
? 831922-ctools-wizard-ahah-patch-2.patch
? 848580-wysiwyg-works.patch
? 853368-field-override-broken.patch
? 856050-field-token-docs.patch
? 865428-post-comment.patch
? 867120-title-got-broken.patch
? 867898-clone-edited-item.patch
? 868410-ie-opacity-fix.patch
? 870820.patch
? 872072-customize-modal-rerolled_1.patch
? 872072-customize-modal.patch
? 873216-broken-stylizer-borders.patch
? 876988-stop-rendering-during-editing.patch
? 891682-ctools-modal-default-title.patch
? 894040-show-cancel-too-much.patch
? 900570-no-such-thing-as-expand.patch
? TODO.txt
? auto-guess-type-ajax-element.patch
? comment_links_8.patch
? ctools-853114-docs.patch
? ctools-862320.patch
? ctools-ajax-redirect-with-delayed-optional-check-for-positive-delay.patch
? ctools-ajax-responder.js-imce-compat.patch
? ctools-custom_content.patch
? ctools-no-base-types-1.patch
? ctools-object-cache.inc-session-handling_0.patch
? ctools_ahah_callback_rebuilds_831922.patch
? ctools_export_ui_title_singular.patch
? ctools_node_build_modes_views_style_0.patch
? export_ui_revert_path.patch
? field-token-docs-custom.patch
? field-token-docs-list1.patch
? field-token-docs-list2.patch
? flexible_css_1.patch
? panels-display-suite-stuff.txt
? views-dimensions.js_.patch
? help/stylizer.html
Index: includes/context.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/includes/context.inc,v
retrieving revision 1.33.2.16
diff -u -p -r1.33.2.16 context.inc
--- includes/context.inc	3 Aug 2010 18:45:21 -0000	1.33.2.16
+++ includes/context.inc	10 Sep 2010 17:07:20 -0000
@@ -614,17 +614,25 @@ function ctools_context_keyword_substitu
         continue;
       }
 
+      // If the keyword is already set by something passed in, don't try to
+      // overwrite it.
+      if (!empty($keywords['%' . $keyword])) {
+        continue;
+      }
+
       // Figure out our keyword and converter, if specified.
       if (strpos($keyword, ':')) {
         list($context, $converter) = explode(':', $keyword);
       }
       else {
         $context = $keyword;
-        $plugin = ctools_get_context($context_keywords[$context]->plugin);
+        if (isset($context_keywords[$keyword])) {
+          $plugin = ctools_get_context($context_keywords[$context]->plugin);
 
-        // Fall back to a default converter, if specified.
-        if ($plugin && !empty($plugin['convert default'])) {
-          $converter = $plugin['convert default'];
+          // Fall back to a default converter, if specified.
+          if ($plugin && !empty($plugin['convert default'])) {
+            $converter = $plugin['convert default'];
+          }
         }
       }
 
@@ -639,7 +647,6 @@ function ctools_context_keyword_substitu
       }
     }
   }
-
   return strtr($string, $keywords);
 }