[geeklog-cvs] geeklog: Fixed nested comments, a path, and problems with $langu...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/01151c4788c3
changeset: 6450:01151c4788c3
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Oct 12 16:12:08 2008 +0200
description:
Fixed nested comments, a path, and problems with $language being overwritten in lib-common.php

diffstat:

1 file changed, 6 insertions(+), 4 deletions(-)
public_html/admin/install/install-plugins.php |   10 ++++++----

diffs (34 lines):

diff -r 3eced35867ba -r 01151c4788c3 public_html/admin/install/install-plugins.php
--- a/public_html/admin/install/install-plugins.php	Sun Oct 12 15:39:38 2008 +0200
+++ b/public_html/admin/install/install-plugins.php	Sun Oct 12 16:12:08 2008 +0200
@@ -37,11 +37,11 @@
 // | Main                                                                      |
 // +---------------------------------------------------------------------------+
 
-require_once "lib-install.php";
 require_once '../../lib-common.php';
+require_once 'lib-install.php';
 
 // Set some vars
-$html_path          = str_replace('admin/install/migrate.php', '', str_replace('admin\install\migrate.php', '', str_replace('\\', '/', __FILE__)));
+$html_path          = str_replace('admin/install/install-plugins.php', '', str_replace('admin\install\install-plugins.php', '', str_replace('\\', '/', __FILE__)));
 $siteconfig_path    = '../../siteconfig.php';
 
 if ($_CONF['path'] == '/path/to/Geeklog/') { // If the Geeklog path has not been defined.
@@ -456,12 +456,14 @@
 /*
         foreach ($_POST['plugins'] as $plugin) {
 
-            if ($plugin['install'] == 'on') { // If the plugin was selected to be installed
-
+            // If the plugin was selected to be installed
+            if (isset($plugin['install']) && ($plugin['install'] == 'on')) {
+*/
                 /**
                  * Install the plugin by including & executing the database queries for each plugin
                  * Start by looking for the database install file.
                  */
+/*
                 $plugin_sql = '';
                 if (file_exists($_CONF['path'] . 'plugins/' . $plugin['name'] . '/sql/' . $_DB_dbms . '_install.php')) {