tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-09-26 Sancho Lerena <slerena@artica.es>

Browse Source 
* index.php: Fixed load of extension startup hook function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5010 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2011-09-26 15:40:07 +00:00
parent 995e71a898
commit e9be7ec4b3
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2011-09-26 Sancho Lerena <slerena@artica.es>
* index.php: Fixed load of extension startup hook function.
2011-09-26 Javier Lanz <javier.lanz@artica.es> 2011-09-26 Javier Lanz <javier.lanz@artica.es>
* godmode/alerts/alert_commands.php: Fixed updating a command. * godmode/alerts/alert_commands.php: Fixed updating a command.

10
pandora_console/index.php
View File

@ -67,10 +67,6 @@ if (file_exists (ENTERPRISE_DIR."/load_enterprise.php")) {
include_once (ENTERPRISE_DIR."/load_enterprise.php"); include_once (ENTERPRISE_DIR."/load_enterprise.php");
} }
/**
* Load the basic configurations of extension and add extensions into menu.
*/
extensions_load_extensions ($config['extensions']);
if (!empty ($config["https"]) && empty ($_SERVER['HTTPS'])) { if (!empty ($config["https"]) && empty ($_SERVER['HTTPS'])) {
$query = 'https://' . $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']; $query = 'https://' . $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];
@ -231,6 +227,12 @@ else {
// Session locking concurrency speedup! // Session locking concurrency speedup!
session_write_close (); session_write_close ();
/**
* Load the basic configurations of extension and add extensions into menu.
* Load here, because if not, some extensions not load well, I don't why.
*/
extensions_load_extensions ($config['extensions']);
// Main block of content // Main block of content
if ($config["pure"] == 0) { if ($config["pure"] == 0) {