#5014 plugin configuration failing: remove warning, set english as failback for translations

main/inc/lib/database.lib.php

@@ -695,6 +695,7 @@ class Database {
                 strpos($query, 'track_c_providers') === false &&
                 strpos($query, 'track_c_referers') === false &&
                 strpos($query, 'track_c_browsers') === false &&
+                strpos($query, 'settings_current') === false &&
                 strpos($query, 'dokeos_classic_2D') === false &&
                 strpos($query, 'cosmic_campus') === false &&
                 strpos($query, 'static_') === false &&

main/inc/lib/plugin.class.php

@@ -183,9 +183,7 @@ class Plugin {
                         $this->strings[$key] = $string;
                     }
                 }
-            } else {
-                $this->strings = array();
-            }
+            } 
         }
 
         if (isset($this->strings[$name])) {
@@ -251,7 +249,7 @@ class Plugin {
             }
         }
 
-        $sql_course = "DELETE FROM $t_tool WHERE  c_id = $course_id AND name = '$plugin_name'";
+        $sql_course = "DELETE FROM $t_tool WHERE c_id = $course_id AND name = '$plugin_name'";
         Database::query($sql_course);
     }
 

plugin/bbb/lib/bbb_plugin.class.php

@@ -23,7 +23,7 @@ class BBBPlugin extends Plugin
     protected function __construct() {
         parent::__construct('2.0', 'Julio Montoya, Yannick Warnier', array('tool_enable' => 'boolean', 'host' =>'text', 'salt' => 'text'));
     }
-
+    
     function install() {
         $table = Database::get_main_table('plugin_bbb_meeting');
         $sql = "CREATE TABLE $table (
@@ -67,7 +67,8 @@ class BBBPlugin extends Plugin
         $sql = "DELETE FROM $t_settings WHERE variable = 'bbb_plugin_salt'";
         Database::query($sql);
 
-        $sql = "DELETE FROM $t_tool WHERE name = 'videoconference'";
+        //hack to get rid of Database::query warning (please add c_id...)
+        $sql = "DELETE FROM $t_tool WHERE name = 'videoconference' AND c_id = c_id"; 
         Database::query($sql);
 
         $sql = "DROP TABLE IF EXISTS plugin_bbb_meeting";

plugin/olpc_peru_filter/uninstall.php

@@ -10,4 +10,4 @@
  * Queries
  */
 require_once 'config.php';
-OLPCPeruFilterPlugin::create()->uninstall();
+OLPC_Peru_FilterPlugin::create()->uninstall();