Merge remote-tracking branch 'origin/master'

Conflicts: .idea/workspace.xml
Cais · Jul 5, 2012 · ec3f959 · ec3f959
2 parents fe31704 + 066cc3f
commit ec3f959
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/functions.php b/functions.php
@@ -562,14 +562,21 @@ function dmm_modified_post(){
 if ( ! function_exists( 'bns_body_classes' ) ) {
     add_filter( 'body_class', 'dmm_add_body_classes' );
     function dmm_add_body_classes( $classes ) {
-            /** Add child-theme-<Name> to default body classes */
-            if ( is_child_theme() ) {
-                $classes[] = 'child-theme-' . sanitize_html_class( get_option( 'stylesheet' ) );
-            }
+        /** Add child-theme-<Name> to default body classes */
+        if ( is_child_theme() ) {
+            $classes[] = 'child-theme-' . sanitize_html_class( get_option( 'stylesheet' ) );
+        }
+
+        /** Add theme-<Name> to default body classes */
+        $classes[] = 'theme-' . sanitize_html_class( get_option( 'template' ) );
+        $classes = apply_filters( 'dmm_add_body_classes', $classes );
+
+        include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+        if ( is_plugin_active( 'jetpack/jetpack.php' ) ) {
+            $classes[]='jetpack';
+        }
+
 
-            /** Add theme-<Name> to default body classes */
-            $classes[] = 'theme-' . sanitize_html_class( get_option( 'template' ) );
-            $classes = apply_filters( 'dmm_add_body_classes', $classes );
-            return $classes;
+        return $classes;
     }
 }