mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Fixed #180: Message (alert) after step8 of installation

Browse Source
This commit is contained in:
SecretR
2013-04-27 15:51:47 +03:00
parent 00ad4d35f5
commit 1fb355a5a6
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107_handlers/online_class.php
View File

@@ -292,6 +292,7 @@ class e_online
//update most ever online //update most ever online
$olCountPrefs = e107::getConfig('history'); // Get historic counts of members on line $olCountPrefs = e107::getConfig('history'); // Get historic counts of members on line
$olCountPrefs->setParam('nologs', true);
if ($total_online > ($olCountPrefs->get('most_members_online') + $olCountPrefs->get('most_guests_online'))) if ($total_online > ($olCountPrefs->get('most_members_online') + $olCountPrefs->get('most_guests_online')))
{ {
$olCountPrefs->set('most_members_online', MEMBERS_ONLINE); $olCountPrefs->set('most_members_online', MEMBERS_ONLINE);

14
install_.php
View File

@@ -1168,8 +1168,7 @@ class e_install
$this->template->SetTag("stage_content", "<div class='alert alert-block alert-{$alertType}'>".$page."</div>".$e_forms->return_form()); $this->template->SetTag("stage_content", "<div class='alert alert-block alert-{$alertType}'>".$page."</div>".$e_forms->return_form());
$this->logLine('Stage 8 completed'); $this->logLine('Stage 8 completed');
e107::getMessage()->reset(); e107::getMessage()->reset(false, false, true);
e107::getMessage()->resetSession();
} }
/** /**
@@ -1306,7 +1305,8 @@ class e_install
$tm->setTheme($this->previous_steps['prefs']['sitetheme'], false); $tm->setTheme($this->previous_steps['prefs']['sitetheme'], false);
// Admin log fix - don't allow logs to be called inside pref handler // Admin log fix - don't allow logs to be called inside pref handler
e107::getConfig('core')->setParam('nologs', false); // change to true to enable log // FIX
e107::getConfig('core')->setParam('nologs', true); // change to false to enable log
$pref = e107::getConfig('core')->getPref(); $pref = e107::getConfig('core')->getPref();
// Set Preferences defined during install - overwriting those that may exist in the XML. // Set Preferences defined during install - overwriting those that may exist in the XML.
@@ -1346,7 +1346,7 @@ class e_install
// Set prefs, save // Set prefs, save
e107::getConfig('core')->setPref($this->previous_steps['prefs']); e107::getConfig('core')->setPref($this->previous_steps['prefs']);
e107::getConfig('core')->save(FALSE,TRUE); // save preferences made during install. e107::getConfig('core')->save(FALSE,TRUE, FALSE); // save preferences made during install.
$this->logLine('Core prefs set to install choices'); $this->logLine('Core prefs set to install choices');
// Create the admin user - replacing any that may be been included in the XML. // Create the admin user - replacing any that may be been included in the XML.
@@ -1356,6 +1356,9 @@ class e_install
$this->dbqry("REPLACE INTO {$this->previous_steps['mysql']['prefix']}user VALUES ({$userp})" ); $this->dbqry("REPLACE INTO {$this->previous_steps['mysql']['prefix']}user VALUES ({$userp})" );
$this->logLine('Admin user created'); $this->logLine('Admin user created');
mysql_close($this->dbLink); mysql_close($this->dbLink);
e107::getMessage()->reset(false, false, true);
return false; return false;
} }
@@ -1370,6 +1373,9 @@ class e_install
e107::getDb()->db_Select_gen("SELECT * FROM #plugin WHERE plugin_path = '".$plugpath."' LIMIT 1"); e107::getDb()->db_Select_gen("SELECT * FROM #plugin WHERE plugin_path = '".$plugpath."' LIMIT 1");
$row = e107::getDb()->db_Fetch(MYSQL_ASSOC); $row = e107::getDb()->db_Fetch(MYSQL_ASSOC);
e107::getSingleton('e107plugin')->install_plugin($row['plugin_id']); e107::getSingleton('e107plugin')->install_plugin($row['plugin_id']);
e107::getMessage()->reset(false, false, true);
return; return;
} }