Merge pull request #186 from vanilla/fix/signature-for-punbb

Fix signature query in PunBB package
vanilla · Nov 11, 2019 · ec495d4 · ec495d4
2 parents 0dd984a + 17b5853
commit ec495d4
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/packages/punbb.php b/packages/punbb.php
@@ -127,12 +127,30 @@ protected function forumExport($ex) {
 
         // Signatures.
         $ex->exportTable('UserMeta', "
-         SELECT
-         id,
-         'Plugin.Signatures.Sig' AS Name,
-         signature
-      FROM :_users u
-      WHERE u.signature IS NOT NULL", array('id ' => 'UserID', 'signature' => 'Value'));
+        select
+           u.id as UserID,
+           'Plugin.Signatures.Format' AS Name,
+           'BBCode' as Value
+        from 
+           :_users u
+        where 
+            u.signature is not null 
+        and 
+            u.signature != ''
+        
+        union
+        
+        select
+            u.id as UserID,
+            'Plugin.Signatures.Sig' AS Name,
+            signature as Value
+        from 
+            :_users u
+        where 
+            u.signature is not null 
+        and 
+            u.signature !='' 
+        ");
 
 
         // Category.