Changeset 9019 for extensions/AMenuManager/amm_install.class.inc.php

Timestamp:

Jan 31, 2011, 11:30:38 PM (13 years ago)

Author:

grum

Message:

release 3.0.1
bug:2159, bug:2162,bug:2163

File:

• extensions/AMenuManager/amm_install.class.inc.php (modified) (3 diffs)

extensions/AMenuManager/amm_install.class.inc.php

@@ -294 +294 @@
       pwg_query($sql);
 
-
+/*
       $users=new GPCUsers();
       $uList=array();
@@ -304 +304 @@
             SET accessUsers='".pwg_db_real_escape_string(implode(',', $uList))."';";
       pwg_query($sql);
-
+*/
       if(isset($this->config['amm_sections_items']))
       {
@@ -353 +353 @@
   } //class
 
+
+  if(!function_exists('create_table_add_character_set') and !defined('IN_ADMIN'))
+  {
+    /**
+     * from admin/include/functions.php
+     *
+     * adds the caracter set to a create table sql query.
+     * all CREATE TABLE queries must call this function
+     * @param string query - the sql query
+     */
+    function create_table_add_character_set($query)
+    {
+      defined('DB_CHARSET') or fatal_error('create_table_add_character_set DB_CHARSET undefined');
+      if ('DB_CHARSET'!='')
+      {
+        if ( version_compare(mysql_get_server_info(), '4.1.0', '<') )
+        {
+          return $query;
+        }
+        $charset_collate = " DEFAULT CHARACTER SET ".DB_CHARSET;
+        if (DB_COLLATE!='')
+        {
+          $charset_collate .= " COLLATE ".DB_COLLATE;
+        }
+        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;
+    }
+  }
+
+
 ?>