Changeset 1249

Show
Ignore:
Timestamp:
01/16/08 18:09:38 (8 months ago)
Author:
mikey
Message:

removed userData, this should be done in userland

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php

    r1248 r1249  
    291291        } 
    292292 
    293         // check for user data 
    294         if ($this->session->hasValue('_userData') === true) { 
    295             $this->template->addGlobalVars($this->session->getValue('_userData'), 'USER_'); 
    296         } 
    297  
    298293        // add meta information to the page 
    299294        foreach ($this->config->getMetaTags() as $key => $value) { 

  • trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php

    r1248 r1249  
    739739        $this->mockMemphisTemplate->expectAt(0, 'addVar', array('frame', 'META_description', 'This is a description.')); 
    740740        $this->mockMemphisTemplate->expectAt(1, 'addVar', array('frame', 'META_keywords', 'keyword1, keyword2')); 
    741         $this->mockMemphisTemplate->expectNever('addGlobalVars'); 
    742         $this->mockSession->setReturnValue('hasValue', false); 
    743741        $this->mockSession->setReturnValue('getName', 'sessionid'); 
    744742        $this->mockSession->setReturnValue('getId', 313); 
    …… 
    766764        $this->mockMemphisTemplate->expectAt(8, 'addGlobalVar', array('SSL_MODE', 'no')); 
    767765        $this->mockMemphisTemplate->expectNever('addVar'); 
    768         $this->mockMemphisTemplate->expectOnce('addGlobalVars', array(array('name' => 'mikey'), 'USER_')); 
    769         $this->mockSession->setReturnValue('hasValue', true); 
    770         $this->mockSession->setReturnValueAt(0, 'getValue', 'variant'); 
    771         $this->mockSession->setReturnValueAt(1, 'getValue', array('name' => 'mikey')); 
     766        $this->mockSession->setReturnValue('getValue', 'variant'); 
    772767        $this->mockSession->setReturnValue('getName', 'sessionid'); 
    773768        $this->mockSession->setReturnValue('getId', 313);