Merge branch 'MDL-36941_master-fix' of git://github.com/markn86/moodle

ericmerrill · Mar 28, 2018 · 83c64f7 · 83c64f7
2 parents 78c0339 + 7489e4d
commit 83c64f7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/iplookup/tests/geoip_test.php b/iplookup/tests/geoip_test.php
@@ -122,7 +122,7 @@ public function test_ip($ip) {
     public function ip_provider() {
         return [
             'IPv4: Sample suggested by maxmind themselves' => ['24.24.24.24'],
-            'IPv4: github.com' =>  ['192.30.255.112'],
+            'IPv4: github.com' => ['192.30.255.112'],
             'IPv6: UCLA' => ['2607:f010:3fe:fff1::ff:fe00:25'],
         ];
     }

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -2191,11 +2191,12 @@ function xmldb_main_upgrade($oldversion) {
     }
 
     if ($oldversion < 2018032700.00) {
-
         // Update default search engine to search_simpledb if global search is disabled and there is no solr index defined.
         if (empty($CFG->enableglobalsearch) && empty(get_config('search_solr', 'indexname'))) {
             set_config('searchengine', 'simpledb');
         }
+
+        // Main savepoint reached.
         upgrade_main_savepoint(true, 2018032700.00);
     }
 

diff --git a/message/output/popup/db/install.xml b/message/output/popup/db/install.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<XMLDB PATH="message/output/popup/db" VERSION="20161221" COMMENT="XMLDB file for Moodle message/output/popup"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../../../../lib/xmldb/xmldb.xsd"
+>
+  <TABLES>
+    <TABLE NAME="message_popup" COMMENT="Keep state of notifications for the popup message processor">
+      <FIELDS>
+        <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
+        <FIELD NAME="messageid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
+        <FIELD NAME="isread" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
+      </FIELDS>
+      <KEYS>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
+      </KEYS>
+      <INDEXES>
+        <INDEX NAME="messageid-isread" UNIQUE="true" FIELDS="messageid, isread"/>
+        <INDEX NAME="isread" UNIQUE="false" FIELDS="isread"/>
+      </INDEXES>
+    </TABLE>
+  </TABLES>
+</XMLDB>
diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php
@@ -83,16 +83,5 @@ function xmldb_message_popup_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
-    if ($oldversion < 2018022000) {
-        // Drop table that is no longer needed.
-        $table = new xmldb_table('message_popup');
-        if ($dbman->table_exists($table)) {
-            $dbman->drop_table($table);
-        }
-
-        // Popup savepoint reached.
-        upgrade_plugin_savepoint(true, 2018022000, 'message', 'popup');
-    }
-
     return true;
 }