Merge pull request civicrm#22 from davecivicrm/4.3

CRM-12977 fix file outputing for WordPress
f2boot · Jun 28, 2013 · d0e22c6 · d0e22c6
2 parents 49703e3 + 724aac5
commit d0e22c6
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/civicrm.php b/civicrm.php
@@ -414,6 +414,11 @@ function civicrm_wp_frontend($shortcode = FALSE) {
       CRM_Utils_Array::value(2, $args) == 'ical' &&
       // skip the html page since that is rendered in the CMS theme
       CRM_Utils_Array::value('html', $_GET) != 1
+    ) ||
+    // skip the html when outputting a file
+    (
+      CRM_Utils_Array::value(0, $args) == 'civicrm' &&
+      CRM_Utils_Array::value(1, $args) == 'file'
     )
   ) {
     add_filter('init', 'civicrm_wp_invoke');