[geeklog-hg] geeklog: Cleaned up code in upgrade function of core plugins

[geeklog-cvs at lists.geeklog.net]

changeset 9582:5284e3ed8a31
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/5284e3ed8a31
user: Tom
date: Sat Feb 21 10:16:47 2015 -0500
description:
Cleaned up code in upgrade function of core plugins

diffstat:

 plugins/calendar/functions.inc    |  5 +----
 plugins/links/functions.inc       |  5 +----
 plugins/polls/functions.inc       |  5 +----
 plugins/staticpages/functions.inc |  5 +----
 plugins/xmlsitemap/functions.inc  |  5 +----
 5 files changed, 5 insertions(+), 20 deletions(-)

diffs (110 lines):

diff -r 3e00eb35b872 -r 5284e3ed8a31 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Thu Feb 19 10:13:42 2015 -0500
+++ b/plugins/calendar/functions.inc	Sat Feb 21 10:16:47 2015 -0500
@@ -1541,9 +1541,6 @@
         return 3002;
     }
 
-    $inst_parms = plugin_autoinstall_calendar('calendar');
-    $pi_gl_version = $inst_parms['info']['pi_gl_version'];
-
     require_once $_CONF['path'] . 'plugins/calendar/sql/'
                                 . $_DB_dbms . '_updates.php';
 
@@ -1659,7 +1656,7 @@
         }
     }
 
-    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'calendar'");
+    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$installed_version' WHERE pi_name = 'calendar'");
 
     return true;
 }
diff -r 3e00eb35b872 -r 5284e3ed8a31 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Thu Feb 19 10:13:42 2015 -0500
+++ b/plugins/links/functions.inc	Sat Feb 21 10:16:47 2015 -0500
@@ -691,9 +691,6 @@
         return 3002;
     }
 
-    $inst_parms = plugin_autoinstall_links('links');
-    $pi_gl_version = $inst_parms['info']['pi_gl_version'];
-
     require_once $_CONF['path'] . 'plugins/links/sql/'
                                 . $_DB_dbms . '_updates.php';
 
@@ -808,7 +805,7 @@
         }
     }
 
-    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'links'");
+    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$installed_version' WHERE pi_name = 'links'");
 
     return true;
 }
diff -r 3e00eb35b872 -r 5284e3ed8a31 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Thu Feb 19 10:13:42 2015 -0500
+++ b/plugins/polls/functions.inc	Sat Feb 21 10:16:47 2015 -0500
@@ -1118,9 +1118,6 @@
         return 3002;
     }
 
-    $inst_parms = plugin_autoinstall_polls('polls');
-    $pi_gl_version = $inst_parms['info']['pi_gl_version'];
-
     require_once $_CONF['path'] . 'plugins/polls/sql/'
                                 . $_DB_dbms . '_updates.php';
 
@@ -1261,7 +1258,7 @@
         }
     }
 
-    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'polls'");
+    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$installed_version' WHERE pi_name = 'polls'");
 
     return true;
 }
diff -r 3e00eb35b872 -r 5284e3ed8a31 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Thu Feb 19 10:13:42 2015 -0500
+++ b/plugins/staticpages/functions.inc	Sat Feb 21 10:16:47 2015 -0500
@@ -1367,9 +1367,6 @@
         return 3002;
     }
 
-    $inst_parms = plugin_autoinstall_staticpages('staticpages');
-    $pi_gl_version = $inst_parms['info']['pi_gl_version'];
-
     require_once $_CONF['path'] . 'plugins/staticpages/sql/'
                                 . $_DB_dbms . '_updates.php';
 
@@ -1527,7 +1524,7 @@
         }
     }
 
-    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'staticpages'");
+    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$installed_version' WHERE pi_name = 'staticpages'");
 
     return true;
 }
diff -r 3e00eb35b872 -r 5284e3ed8a31 plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Thu Feb 19 10:13:42 2015 -0500
+++ b/plugins/xmlsitemap/functions.inc	Sat Feb 21 10:16:47 2015 -0500
@@ -99,9 +99,6 @@
         return 3002;
     }
 
-    $inst_parms = plugin_autoinstall_xmlsitemap('xmlsitemap');
-    $pi_gl_version = $inst_parms['info']['pi_gl_version'];
-
     require_once $_CONF['path'] . 'plugins/xmlsitemap/sql/' . $_DB_dbms . '_updates.php';
     require_once $_CONF['path'] . 'plugins/xmlsitemap/install_updates.php';
 
@@ -143,7 +140,7 @@
         }
     }
 
-    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'xmlsitemap'");
+    DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$installed_version' WHERE pi_name = 'xmlsitemap'");
 
     return true;
 }