Changeset 11878

Show
Ignore:
Timestamp:
08/30/07 16:01:49 (1 year ago)
Author:
bergie
Message:

Use $midgard->argv instead of $_MIDGARDargv? as the latter breaks urls

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.core/midcom/application.php

    r11872 r11878  
    552552        // Parse the URL 
    553553        $this->_parser = $this->serviceloader->load('midcom_core_service_urlparser'); 
    554         $this->_parser->parse($_MIDGARD['argv']); 
     554        $this->_parser->parse($GLOBALS['midgard']->argv); 
    555555         
    556556        if (!$this->_parser)  
    …… 
    25972597     * Echo the registred javascript code. 
    25982598     * 
    2599  
    2600      * <b>Note:</b> These functions originate from the class midcom_admin_content and were 
    2601      * moved to here to allow datamanager edit forms with DHTML widget support outside 
    2602      * of AIS. The function stubs in midcom_admin_content remain in place for 
    2603      * backwards-compatibility. 
    2604      * 
    2605      * The sequence of the add_jsfile and add_jscript commands is kept stable. 
    2606      * 
    2607      * This is usually called during the HEAD region of your style: 
    2608      * 
    2609      * <code> 
    2610      * <HTML> 
    2611      *     <HEAD> 
    2612      *         <!-- Further HEAD Tags --> 
    2613      *         <?php echo $_MIDCOM->print_jscripts(); ?> 
    2614      *     </HEAD> 
    2615      * </HTML> 
    2616      * </code> 
    2617      * 
    2618      * @see midcom_application::add_jsfile(); 
    2619      * @see midcom_application::add_jscript(); 
    2620      * @see midcom_application::add_jsonload(); 
    2621      * @see midcom_application::print_jsonload(); 
    2622      * 
    2623      * @deprecated This function is deprecated as of MidCOM 2.2, being replaced by print_head_elements, 
    2624      *     the call is releated to that function by default. 
    2625      * @see midcom_application::print_head_elements(); 
    2626      */ 
    2627     function print_jscripts() { 
    2628         debug_add('DEPRECATED FUNCTION USED: midcom_application::print_jscripts().', MIDCOM_LOG_WARN); 
    2629         $this->print_head_elements(); 
    2630     } 
    2631  
    2632     /** 
    2633      * Echo the registred javascript code. 
    2634      * 
    26352599     * This allows MidCOM components to register JavaScript code 
    26362600     * during page processing. The site style code can then query this queued-up code 

  • trunk/midcom/midcom.core/midcom/services/_sessioning.php

    r11359 r11878  
    6161    function midcom_service__sessioning() 
    6262    { 
    63         debug_push_class(__CLASS__, __FUNCTION__); 
    6463        static $started = false; 
    6564 
    6665        if ($started) 
    6766        { 
    68             debug_pop(); 
    6967            $_MIDCOM->generate_error("MidCOM Sessioning has already been started, it must not be started twice. Aborting", 
    7068                                               MIDCOM_ERRCRIT); 
    …… 
    7573        @session_start(); 
    7674 
    77         debug_print_r("SESSION: Dump of the current complete session", $_SESSION); 
    78  
    7975        // Disable caching for sessioned requests 
    80         $GLOBALS["midcom"]->cache->content->no_cache(); 
     76        $_MIDCOM->cache->content->no_cache(); 
    8177 
    8278        // Check for session data and load or initialize it, if neccessary 
    …… 
    8682            $_SESSION["midcom_session_data"]["midcom.service.sessioning"]["startup"] = serialize(time()); 
    8783        } 
    88  
    89         debug_print_r("SESSION: Dump after construction (serialized)", $_SESSION["midcom_session_data"]); 
    90         debug_pop(); 
    9184    } 
    9285