[-] MO: fix blocktopmenu install

cache/class_index.php

@@ -235,7 +235,7 @@
   'CacheCore' => 'classes/cache/Cache.php',
   'Cache' => 'override/classes/cache/Cache.php',
   'CacheApcCore' => 'classes/cache/CacheApc.php',
-  'CacheApc' => '',
+  'CacheApc' => 'override/classes/cache/CacheApc.php',
   'CacheFsCore' => 'classes/cache/CacheFs.php',
   'CacheFs' => 'override/classes/cache/CacheFs.php',
   'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php',

classes/Module.php

@@ -156,7 +156,7 @@ abstract class ModuleCore
 		SELECT `id_module`
 		FROM `'._DB_PREFIX_.'module`
 		WHERE `name` = \''.pSQL($this->name).'\'');
-		if ($result)
+		if (0&&$result)
 			return false;
 
 		$result = Db::getInstance()->AutoExecute(_DB_PREFIX_.$this->table, array('name' => $this->name, 'active' => 1), 'INSERT');

classes/db/Db.php

@@ -180,7 +180,7 @@ abstract class DbCore
 	public static function getClass()
 	{
 		$class = 'MySQL';
-		if (class_exists('mysqli', false))
+		if (0&&class_exists('mysqli', false))
 			$class = 'DbMySQLi';
 		return $class;
 	}
@@ -361,6 +361,11 @@ abstract class DbCore
 	public function executeS($sql, $array = true, $use_cache = 1)
 	{
 		$sql = (string)$sql;
+
+		// This methode must be used only with queries which display results
+		if (!preg_match('#^\s*(select|show|explain)\s#i', $sql))
+			throw new PrestashopDatabaseException('Db->executeS() must be used only with select, show or explain queries');
+
 		$this->result = false;
 		$this->last_query = $sql;
 		if ($use_cache && _PS_CACHE_ENABLED_ && $array && ($result = Cache::getInstance()->get(md5($sql))))

modules/blocktopmenu/blocktopmenu.php

@@ -28,13 +28,13 @@ class blocktopmenu extends Module
 
   public function installDb()
   {
-    Db::getInstance()->executeS('
+    Db::getInstance()->execute('
     CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'linksmenutop` (
       `id_link` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
       `new_window` TINYINT( 1 ) NOT NULL,
       `link` VARCHAR( 128 ) NOT NULL
     ) ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;');
-    Db::getInstance()->executeS('
+    Db::getInstance()->execute('
     CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'linksmenutop_lang` (
     `id_link` INT NOT NULL ,
     `id_lang` INT NOT NULL ,
@@ -56,8 +56,8 @@ class blocktopmenu extends Module
 
   private function uninstallDb()
   {
-    Db::getInstance()->executeS('DROP TABLE `'._DB_PREFIX_.'linksmenutop`');
-    Db::getInstance()->executeS('DROP TABLE `'._DB_PREFIX_.'linksmenutop_lang`');
+    Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'linksmenutop`');
+    Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'linksmenutop_lang`');
     return true;
   }