Merge remote-tracking branch 'upstream/master'

ekino · Oct 1, 2014 · f886d25 · f886d25
2 parents 9913485 + 80f457e
commit f886d25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Subscriber/TablePrefixSubscriber.php b/Subscriber/TablePrefixSubscriber.php
@@ -63,7 +63,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $args)
             return;
         }
 
-        if ($classMetadata->getReflectionClass()->implementsInterface('Ekino\\WordpressBundle\\Model\\WordpressEntityInterface')) {
+        if ($classMetadata->getReflectionClass() && $classMetadata->getReflectionClass()->implementsInterface('Ekino\\WordpressBundle\\Model\\WordpressEntityInterface')) {
             $classMetadata->setPrimaryTable(array('name' => $this->prefix . $classMetadata->getTableName()));
 
             foreach ($classMetadata->getAssociationMappings() as $fieldName => $mapping) {
@@ -74,4 +74,4 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $args)
             }
         }
     }
-}
+}
diff --git a/Wordpress/Wordpress.php b/Wordpress/Wordpress.php
@@ -77,7 +77,7 @@ public function getContent()
 
         define('WP_USE_THEMES', true);
 
-        global $wp, $wp_the_query, $wp_query, $allowedentitynames;
+        global $wp, $wp_the_query, $wpdb, $wp_query, $allowedentitynames;
 
         $loader = $this->getWordpressDirectory() . 'wp-blog-header.php';