Changeset 1502
- Timestamp:
- 04/06/08 01:40:20 (1 month ago)
- Files:
-
- trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisIncludeTemplatePageElement.php (modified) (4 diffs)
- trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisIncludeTemplatePageElementTestCase.php (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisIncludeTemplatePageElement.php
r1362 r1502 24 24 * @var string 25 25 */ 26 protected $source = '';26 protected $source = null; 27 27 /** 28 28 * base directory where content is located … … 74 74 public function getCacheVars() 75 75 { 76 if (null === $this->source) { 77 return array(); 78 } 79 76 80 return array('source' => $this->source); 77 81 } … … 84 88 public function getUsedFiles() 85 89 { 90 if (null === $this->source) { 91 return array(); 92 } 93 86 94 return array(self::$tmplPath . DIRECTORY_SEPARATOR . $this->source); 87 95 } … … 99 107 } 100 108 101 $this->context['template']->readTemplatesFromFile($this->source); 109 if (null === $this->source) { 110 return ''; 111 } 112 113 $this->context['template']->readTemplatesFromInput($this->source); 102 114 return $this->context['template']->getParsedTemplate($this->name); 103 115 } trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php
r1462 r1502 40 40 // memphis 41 41 $suite->addTestFile($dir . '/memphis/stubMemphisIncludeFilePageElementTestCase.php'); 42 $suite->addTestFile($dir . '/memphis/stubMemphisIncludeTemplatePageElementTestCase.php'); 42 43 $suite->addTestFile($dir . '/memphis/stubMemphisPageElementTestCase.php'); 43 44 $suite->addTestFile($dir . '/memphis/stubMemphisProcessorCachableTestCase.php');
