Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm · Till Brehm · commit 5883ac237306 · 2017-09-07T08:46:53.000+02:00
wrong sql-call during install

See merge request !637
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -235,7 +235,7 @@ public function configure_database() {
 		}
 
 		$unwanted_sql_plugins = array('validate_password');		
-		$sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins);
+		$sql_plugins = $this->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins);
 		if(is_array($sql_plugins) && !empty($sql_plugins)) {
 			foreach ($sql_plugins as $plugin) echo "Login in to MySQL and disable $plugin[plugin_name] with:\n\n    UNINSTALL PLUGIN $plugin[plugin_name];";
 			die();

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public function configure_database() {`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`$unwanted_sql_plugins = array('validate_password');`
`238`		`- $sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins);`
	`238`	`+ $sql_plugins = $this->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins);`
`239`	`239`	`if(is_array($sql_plugins) && !empty($sql_plugins)) {`
`240`	`240`	`foreach ($sql_plugins as $plugin) echo "Login in to MySQL and disable $plugin[plugin_name] with:\n\n UNINSTALL PLUGIN $plugin[plugin_name];";`
`241`	`241`	`die();`