Changeset 1688489

Timestamp:

06/30/2017 07:10:56 PM (9 years ago)

Author:

datainterlock

Message:

Update to 0.1.4 Hopefully fixing db not updating.

Location:

note-press/trunk

Files:

• Note_Press.php (modified) (1 diff)
• README.txt (modified) (2 diffs)
• admin/Note_Press-admin-menu.php (modified) (2 diffs)
• includes/class-Note_Press-activator.php (modified) (1 diff)

note-press/trunk/Note_Press.php

@@ -17 +17 @@
  * Plugin URI:        http://www.datainterlock.com
  * Description:       Add, edit and delete multiple notes and display them with icons on the Admin page.
- * Version:           0.1.3
+ * Version:           0.1.4
  * Author:            datainterlock
  * Author URI:        http://www.datainterlock.com

note-press/trunk/README.txt

@@ -76 +76 @@
 
 == Changelog ==
+= 0.1.4 =
+Fixed update breaking as a result of the plugin not deactivating during upgrade.
+
+== Changelog ==
 = 0.1.3 =
 *Boilerplate updated.
@@ -90 +94 @@
 *Fixed column sorting which was broken in 0.1.2 as a result of preparing queries.
 
-
 = 0.1.2 =
 *Security update to reduce risk of SQL injection.

note-press/trunk/admin/Note_Press-admin-menu.php

@@ -704 +704 @@
         }
     }
-    
-if (get_option("Note_Press_db_version", '2.0') == "1.0")
+
+function CheckDB()
 {
-    Note_PressshowMessage(__('Please deactivate and re-activate Note Press to complete the upgrade.', 'Note_Press'), true);
-    exit;
-}   
+    global $wpdb;
+    $tablename = $wpdb->prefix . "Note_Press";
+    $SQL = "SHOW COLUMNS FROM $tablename LIKE 'Priority'";
+    $wpdb->get_results($SQL);
+    if ($wpdb->num_rows == 0)
+    {
+        Note_PressshowMessage(__('Please deactivate and re-activate Note Press to complete the upgrade.', 'Note_Press'), true);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+if (CheckDB())
+{
+    die();
+}
+else
+{
 if (isset($_POST['Update']))
     {
@@ -782 +800 @@
     Note_Pressget_notes();
     }
+}
 ?>

note-press/trunk/includes/class-Note_Press-activator.php

@@ -71 +71 @@
         ";
         $wpdb->query($sql);
-        if (get_option("Note_Press_db_version", '2.0') == "1.0")
+        $tablename = $wpdb->prefix . "Note_Press";
+        $SQL = "SHOW COLUMNS FROM $tablename LIKE 'Priority'";
+        $wpdb->get_results($SQL);
+        if ($wpdb->num_rows == 0)
             {
             $table_name = $wpdb->prefix . "Note_Press";