fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 0000 Support for php 5.2 in Solr implementation

Browse Source 
Add support for php 5.2 in Solr implementation:
- Exception function has two parameters
- use of function call_user_func
This commit is contained in:
Herbert Saal Gutierrez
2012-05-16 11:59:47 -04:00
parent b4067145a7
commit 920d4908bf
6 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/classes/class.system.php
View File

@@ -1008,7 +1008,7 @@ class System {
return $cities;
}
public static function getSystemConfiguration($globalIniFile = '', $wsIniFile = '')
public static function getSystemConfiguration($globalIniFile = '', $wsIniFile = '', $wsName = '')
{
$readGlobalIniFile = false;
$readWsIniFile = false;
@@ -1019,12 +1019,15 @@ class System {
if (empty($wsIniFile)) {
if (defined('PATH_DB')) { // if we're on a valid workspace env.
$uriParts = explode('/', getenv("REQUEST_URI"));
if (substr($uriParts[1], 0, 3 ) == 'sys') {
$wsName = substr($uriParts[1], 3);
$wsIniFile = PATH_DB . $wsName . PATH_SEP . 'env.ini';
if (empty($wsName)) {
$uriParts = explode('/', getenv("REQUEST_URI"));
if (substr($uriParts[1], 0, 3 ) == 'sys') {
$wsName = substr($uriParts[1], 3);
}
}
$wsIniFile = PATH_DB . $wsName . PATH_SEP . 'env.ini';
}
}
@@ -1121,9 +1124,14 @@ class System {
return $result;
}
function solrEnv()
function solrEnv($sysName = '')
{
$conf = System::getSystemConfiguration();
if (empty($sysName)) {
$conf = System::getSystemConfiguration();
}
else {
$conf = System::getSystemConfiguration('', '', $sysName);
}
if (!isset($conf['solr_enabled']) || !isset($conf['solr_host']) || !isset($conf['solr_instance'])) {
return false;