Bug #28234 ยป class.tslib_content.php.diff

Jo Hasenau, 2011-07-15 14:32

View differences:

1852 1852
					if ($functionType === 'hook') {
1853 1853
						$singleConf = $conf;
1854 1854
					}
1855 1855
					// check if key is still containing something, since it might have been changed by next level stdWrap before
1856 1856
					if ((isset($conf[$functionName]) || $conf[$functionProperties]) &&
1857
							!($functionType == 'boolean' && $conf[$functionName] === '0')) {
1857
							!($functionType == 'boolean' && !$conf[$functionName])) {
1858 1858
						//add both keys - with and without the dot - to the set of executed functions
1859 1859
						$isExecuted[$functionName] = TRUE;
1860 1860
						$isExecuted[$functionProperties] = TRUE;
1861 1861
						// call the function with the prefix stdWrap_ to make sure nobody can execute functions just by adding their name to the TS Array
1862 1862
						$functionName = 'stdWrap_' . $functionName;
1863 1863
						$content = $this->$functionName(
1864 1864
							$content,
1865 1865
							$singleConf
1866 1866
						);
1867
					// for booleans we have to mark the function as executed in any case, even if it has been 0, '' or false to avoid a second call based on the functionProperties, which would always be true
1868
					} else if($functionType == 'boolean' && !$conf[$functionName]) {
1869
						$isExecuted[$functionName] = TRUE;
1870
						$isExecuted[$functionProperties] = TRUE;
1867 1871
					}
1868 1872
				}
1869 1873
			}
1870 1874

  
1871 1875
			unset($this->stopRendering[$this->stdWrapRecursionLevel]);
    (1-1/1)