Changeset 12309

Show
Ignore:
Timestamp:
09/16/07 19:57:46 (1 year ago)
Author:
tarjei
Message:

Fixed compileerror in the host handler + bad MIDCOM_ROOT setting. refs #98

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/MidCOM_2_8/midcom.core/midcom/helper/hostconfig.php

    r6141 r12309  
    178178        $codeinit .= "\n?><(code-init-before-midcom)><?php\n"; 
    179179         
     180        if (!defined('MIDCOM_ROOT')) { 
     181            $root = dirname(dirname(dirname(__FILE__))); 
     182        } else { 
     183            $root = MIDCOM_ROOT; 
     184        } 
    180185        $codeinit .= "\nif(!defined('MIDCOM_ROOT')) {"; 
    181186         
    182         $codeinit .= "\n    define('MIDCOM_ROOT','".MIDCOM_ROOT."');"; 
     187        $codeinit .= "\n    define('MIDCOM_ROOT','". $root."');"; 
    183188        $codeinit .= "\n}\n"; 
    184189         

  • branches/MidCOM_2_8/midgard.admin.sitewizard/handler/host.php

    r12126 r12309  
    534534    } 
    535535 
    536     function _create_topics_recursive($nodes, $this->created_groups, $sitegroup, $root_topic_id, $admin_group) 
     536    function _create_topics_recursive($nodes, $sitegroup, $root_topic_id, $admin_group) 
    537537    { 
    538538        $session = new midcom_service_session(); 
    …… 
    609609                if (isset($node['nodes'])) 
    610610                { 
    611                     $this->_create_topics_recursive($node['nodes'], $this->created_groups, $sitegroup, $root_topic_id, $admin_group); 
     611                    $this->_create_topics_recursive($node['nodes'], $sitegroup, $root_topic_id, $admin_group); 
    612612                } 
    613613            }