[geeklog-cvs] geeklog: Fixes to get the XMLSitemap plugin's postinstall workin...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun May 17 04:05:20 EDT 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/99e5a429c202
changeset: 7029:99e5a429c202
user: Dirk Haun <dirk at haun-online.de>
date: Sun May 17 10:05:01 2009 +0200
description:
Fixes to get the XMLSitemap plugin's postinstall working from the install script
diffstat:
5 files changed, 23 insertions(+), 6 deletions(-)
plugins/xmlsitemap/autoinstall.php | 3 +--
public_html/admin/install/index.php | 21 +++++++++++++++++++--
public_html/admin/install/lib-install.php | 2 +-
public_html/admin/install/lib-upgrade.php | 2 +-
public_html/docs/history | 1 +
diffs (98 lines):
diff -r da4f858d63a6 -r 99e5a429c202 plugins/xmlsitemap/autoinstall.php
--- a/plugins/xmlsitemap/autoinstall.php Sun May 17 09:05:31 2009 +0200
+++ b/plugins/xmlsitemap/autoinstall.php Sun May 17 10:05:01 2009 +0200
@@ -118,7 +118,6 @@
* @param string $pi_name Plugin name
* @return boolean TRUE: plugin compatible; FALSE: not compatible
*/
-/*
function plugin_postinstall_xmlsitemap($pi_name)
{
global $_CONF, $_XMLSMAP_CONF;
@@ -128,5 +127,5 @@
// Create an XML sitemap for the first time
return XMLSMAP_update();
}
-*/
+
?>
diff -r da4f858d63a6 -r 99e5a429c202 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php Sun May 17 09:05:31 2009 +0200
+++ b/public_html/admin/install/index.php Sun May 17 10:05:01 2009 +0200
@@ -47,7 +47,7 @@
*/
function INST_installEngine($install_type, $install_step)
{
- global $_CONF, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_TABLES, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir;
+ global $_CONF, $_TABLES, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_DB_dbms, $_DB_table_prefix, $_URL, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir;
switch ($install_step) {
@@ -489,6 +489,23 @@
if (! $install_plugins) {
// do a default install of all available plugins
+
+ /**
+ * For the plugin install we would actually need
+ * lib-common.php in the global namespace. Since
+ * we're in a function, we need to hack a few
+ * things and rely on a few global declarations
+ * (see beginning of function).
+ */
+
+ // Hack: not needed here - avoid notice
+ $_DB_mysqldump_path = '';
+
+ // Hack: lib-common will overwrite $language
+ $lx_inst = $language;
+ require_once '../../lib-common.php';
+ $language = $lx_inst;
+
INST_defaultPluginInstall();
}
@@ -832,7 +849,7 @@
*/
function INST_defaultPluginInstall()
{
- global $_CONF, $_TABLES;
+ global $_CONF, $_TABLES, $_DB_dbms, $_DB_table_prefix;
if (! function_exists('COM_errorLog')) {
// "Emergency" version of COM_errorLog
diff -r da4f858d63a6 -r 99e5a429c202 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php Sun May 17 09:05:31 2009 +0200
+++ b/public_html/admin/install/lib-install.php Sun May 17 10:05:01 2009 +0200
@@ -673,7 +673,7 @@
*/
function INST_getPluginInfo($plugin)
{
- global $_CONF;
+ global $_CONF, $_TABLES, $_DB_dbms, $_DB_table_prefix;
$info = false;
diff -r da4f858d63a6 -r 99e5a429c202 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php Sun May 17 09:05:31 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php Sun May 17 10:05:01 2009 +0200
@@ -846,7 +846,7 @@
*/
function INST_autoinstallNewPlugins()
{
- global $_CONF, $_TABLES;
+ global $_CONF, $_TABLES, $_DB_dbms, $_DB_table_prefix;
$newplugins = array();
diff -r da4f858d63a6 -r 99e5a429c202 public_html/docs/history
--- a/public_html/docs/history Sun May 17 09:05:31 2009 +0200
+++ b/public_html/docs/history Sun May 17 10:05:01 2009 +0200
@@ -11,6 +11,7 @@
+ Comment moderation and editable comments, by Jared Wenerd
Other changes:
+- Fixed plugin postinstall from the install script
- Made COM_createImage recognize https:// URLs (bug #0000881) [Dirk]
- Fixed notices in the config class (reported by tgc and others) [Dirk]
- Fixed empty entries in the "Type" dropdown on the Advanced Search page.
More information about the geeklog-cvs
mailing list