Changeset 2488 for trunk/admin/include/functions.php

Timestamp:

Aug 28, 2008, 2:32:39 AM (16 years ago)

Author:

rvelices

Message:

• based on test_menu by grum (thanks to you) - integration of dynamic menu bar to pwg
• the menubar is composed now of dynamic blocks that can be ordered/hidden
• plugins can add their own blocks

File:

• trunk/admin/include/functions.php (modified) (2 diffs)

trunk/admin/include/functions.php

@@ -1846 +1846 @@
 function create_table_add_character_set($query)
 {
-  defined('DB_CHARSET') or die('create_table_add_character_set DB_CHARSET undefined');
+  defined('DB_CHARSET') or trigger_error('create_table_add_character_set DB_CHARSET undefined', E_USER_ERROR);
   if ('DB_CHARSET'!='')
   {
@@ -1854 +1854 @@
     }
     $charset_collate = " DEFAULT CHARACTER SET ".DB_CHARSET;
-    if ('DB_COLLATE'!='')
+    if (DB_COLLATE!='')
     {
       $charset_collate .= " COLLATE ".DB_COLLATE;
     }
-    $query=trim($query);
-    $query=trim($query, ';');
-    if (preg_match('/^CREATE\s+TABLE/i',$query))
-    {
-      $query.=$charset_collate;
-    }
-    $query .= ';';
+    if ( is_array($query) )
+    {
+      foreach( $query as $id=>$q)
+      {
+        $q=trim($q);
+        $q=trim($q, ';');
+        if (preg_match('/^CREATE\s+TABLE/i',$q))
+        {
+          $q.=$charset_collate;
+        }
+        $q .= ';';
+        $query[$id] = $q;
+      }
+    }
+    else
+    {
+      $query=trim($query);
+      $query=trim($query, ';');
+      if (preg_match('/^CREATE\s+TABLE/i',$query))
+      {
+        $query.=$charset_collate;
+      }
+      $query .= ';';
+    }
   }
   return $query;