16902_v2.diff

Administrator Admin, 2011-01-13 12:33

Download (21.3 kB)

 
typo3/sysext/cms/tslib/content/class.tslib_content_template.php (revision )
42 42
	 * @return	string		Output
43 43
	 * @see substituteMarkerArrayCached()
44 44
	 */
45
	public function render($conf = array()) {
45
	public function render(array $conf = array()) {
46 46
		$subparts = array();
47 47
		$marks = array();
48 48
		$wraps = array();
typo3/sysext/cms/tslib/content/class.tslib_content_contenttable.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45

  
46 46
		$controlTable = t3lib_div::makeInstance('tslib_controlTable');
47 47

  
typo3/sysext/cms/tslib/content/class.tslib_content_media.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$content = '';
46 46
		$flexParams = isset($conf['flexParams.'])
47 47
			? $this->cObj->stdWrap($conf['flexParams'], $conf['flexParams.'])
typo3/sysext/cms/tslib/content/class.tslib_content_fluidtemplate.php (revision )
61 61
	 * @author	Benjamin Mack		<benni@typo3.org>
62 62
	 * @author	Bastian Waidelich	<bastian@typo3.org>
63 63
	 */
64
	public function render($conf = array()) {
64
	public function render(array $conf = array()) {
65 65
			// check if the needed extensions are installed
66 66
		if (!t3lib_extMgm::isLoaded('fluid')) {
67 67
			return 'You need to install "Fluid" in order to use the FLUIDTEMPLATE content element';
typo3/sysext/cms/tslib/content/class.tslib_content_html.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45

  
46 46
		$theValue = $conf['value'];
47 47

  
typo3/sysext/cms/tslib/content/class.tslib_content_form.php (revision )
54 54
	 * @param	array		Alternative formdata overriding whatever comes from TypoScript
55 55
	 * @return	string		Output
56 56
	 */
57
	public function render($conf = array(), $formData = '') {
57
	public function render(array $conf = array(), $formData = '') {
58 58
		$content = '';
59 59
		if (is_array($formData)) {
60 60
			$dataArray = $formData;
typo3/sysext/cms/tslib/content/class.tslib_content_file.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45

  
46 46
		$file = isset($conf['file.'])
47 47
			? $this->cObj->stdWrap($conf['file'], $conf['file.'])
typo3/sysext/cms/tslib/content/class.tslib_content_imageresource.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45

  
46 46
		$GLOBALS['TSFE']->lastImgResourceInfo = $this->cObj->getImgResource($conf['file'], $conf['file.']);
47 47

  
typo3/sysext/cms/tslib/content/class.tslib_content_user.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$content = '';
46 46
		if ($this->cObj->getUserObjectType() === FALSE) {
47 47
				// Come here only if we are not called from $TSFE->INTincScript_process()!
typo3/sysext/cms/tslib/content/class.tslib_content_loadregister.php (revision )
42 42
	 * @param	array		Array of TypoScript properties
43 43
	 * @return	string		Empty string (the cObject only sets internal data!)
44 44
	 */
45
	public function render($conf = array()) {
45
	public function render(array $conf = array()) {
46 46
		array_push($GLOBALS['TSFE']->registerStack, $GLOBALS['TSFE']->register);
47 47

  
48 48
		if (is_array($conf)) {
typo3/sysext/cms/tslib/content/class.tslib_content_imagetext.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$content = '';
46 46

  
47 47
		if (isset($conf['text.'])) {
typo3/sysext/cms/tslib/content/class.tslib_content_userinternal.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$this->cObj->setUserObjectType(tslib_cObj::OBJECTTYPE_USER_INT);
46 46
		$substKey = 'INT_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
47 47
		$content = '<!--' . $substKey . '-->';
typo3/sysext/cms/tslib/content/class.tslib_content_phpscriptinternal.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$ext = $conf['scriptSuffix'];
46 46
		unset($conf['scriptSuffix']);
47 47

  
typo3/sysext/cms/tslib/content/class.tslib_content_offsettable.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		/** @var $controlTable tslib_tableOffset */
46 46
		$controlTable = t3lib_div::makeInstance('tslib_tableOffset');
47 47

  
typo3/sysext/cms/tslib/content/class.tslib_content_case.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		if ($this->cObj->checkIf($conf['if.'])) {
46 46
			$setCurrent = isset($conf['setCurrent.']) ? $this->cObj->stdWrap($conf['setCurrent'], $conf['setCurrent.']) : $conf['setCurrent'];
47 47
			if($setCurrent) {
typo3/sysext/cms/tslib/content/class.tslib_content_shockwaveflashobject.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$prefix = '';
46 46
		if ($GLOBALS['TSFE']->baseUrl) {
47 47
			$prefix = $GLOBALS['TSFE']->baseUrl;
typo3/sysext/cms/tslib/content/class.tslib_content_contentobjectarrayinternal.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		if (is_array($conf)) {
46 46
			$substKey = 'INT_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
47 47
			$includeLibs = isset($conf['includeLibs.'])
typo3/sysext/cms/tslib/content/class.tslib_content_quicktimeobject.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$params = $prefix = '';
46 46
		if ($GLOBALS['TSFE']->baseUrl) {
47 47
			$prefix = $GLOBALS['TSFE']->baseUrl;
typo3/sysext/cms/tslib/content/class.tslib_content_scalablevectorgraphics.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Empty string (the cObject only sets internal data!)
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$width = isset($conf['width.'])
46 46
			 ? $this->cObj->stdWrap($conf['width'], $conf['width.'])
47 47
			 : $conf['width'];
typo3/sysext/cms/tslib/content/class.tslib_content_searchresult.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		if (t3lib_div::_GP('sword') && t3lib_div::_GP('scols')) {
46 46
			$search = t3lib_div::makeInstance('tslib_search');
47 47
			$search->register_and_explode_search_string(t3lib_div::_GP('sword'));
typo3/sysext/cms/tslib/content/class.tslib_content_phpscript.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45

  
46 46
		$file = isset($conf['file.'])
47 47
			? $this->cObj->stdWrap($conf['file'], $conf['file.'])
typo3/sysext/cms/tslib/content/class.tslib_content_columns.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$content = '';
46 46
		if (is_array($conf) && $this->cObj->checkIf($conf['if.'])) {
47 47
			$tdRowCount = 0;
typo3/sysext/cms/tslib/content/class.tslib_content_restoreregister.php (revision )
42 42
	 * @param	array		Array of TypoScript properties
43 43
	 * @return	string		Empty string (the cObject only sets internal data!)
44 44
	 */
45
	public function render($conf = array()) {
45
	public function render(array $conf = array()) {
46 46
		$GLOBALS['TSFE']->register = array_pop($GLOBALS['TSFE']->registerStack);
47 47
		return '';
48 48
	}
typo3/sysext/cms/tslib/content/class.tslib_content_cleargif.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45

  
46 46
		$width = isset($conf['width.'])
47 47
				? $this->cObj->stdWrap($conf['width'], $conf['width.'])
typo3/sysext/cms/tslib/content/class.tslib_content_multimedia.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$content = '';
46 46
		$filename = isset($conf['file.'])
47 47
			? $this->cObj->stdWrap($conf['file'], $conf['file.'])
typo3/sysext/cms/tslib/content/class.tslib_content_text.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$content = $conf['value'];
46 46
		unset($conf['value']);
47 47
		if(count($conf)) {
typo3/sysext/cms/tslib/content/class.tslib_content_records.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$theValue = '';
46 46

  
47 47
		$originalRec = $GLOBALS['TSFE']->currentRecord;
typo3/sysext/cms/tslib/content/class.tslib_content_hierarchicalmenu.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45

  
46 46
		$theValue = '';
47 47

  
typo3/sysext/cms/tslib/content/class.tslib_content_image.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		if ($this->cObj->checkIf($conf['if.'])) {
46 46
			$theValue = $this->cObj->cImage($conf['file'], $conf);
47 47
			if (isset($conf['stdWrap.'])) {
typo3/sysext/cms/tslib/content/class.tslib_content_editpanel.php (revision )
38 38
	 * @param	array		Array of TypoScript properties
39 39
	 * @return	string		Output
40 40
	 */
41
	public function render($conf = array()) {
41
	public function render(array $conf = array()) {
42 42
		$theValue = '';
43 43
		if ($GLOBALS['TSFE']->beUserLogin) {
44 44
			$theValue = $this->cObj->editPanel($theValue, $conf);
typo3/sysext/cms/tslib/content/class.tslib_content_contentobjectarray.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		if (is_array($conf)) {
46 46
			$content = '';
47 47
			if ($this->cObj->checkIf($conf['if.'])) {
typo3/sysext/cms/tslib/content/class.tslib_content_abstract.php (revision )
55 55
	 * @param array $conf
56 56
	 * @return string
57 57
	 */
58
	public abstract function render($conf = array());
58
	public abstract function render(array $conf = array());
59 59

  
60 60
	/**
61 61
	 * Compatibility stdWrap wrapper.
......
64 64
	 * @param	array		$conf stdWrap configuration.
65 65
	 * @deprecated since TYPO3 4.5, this function will be removed in TYPO3 4.7, use $this->cObj->stdWrap() instead.
66 66
	 */
67
	public function stdWrap($content = '', $conf = array()) {
67
	public function stdWrap($content = '', array $conf = array()) {
68 68
		t3lib_div::logDeprecatedFunction();
69 69

  
70 70
		return $this->cObj->stdWrap($content, $conf);
typo3/sysext/cms/tslib/content/class.tslib_content_content.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45
		$theValue = '';
46 46

  
47 47
		$originalRec = $GLOBALS['TSFE']->currentRecord;
typo3/sysext/cms/tslib/content/class.tslib_content_horizontalruler.php (revision )
41 41
	 * @param	array		Array of TypoScript properties
42 42
	 * @return	string		Output
43 43
	 */
44
	public function render($conf = array()) {
44
	public function render(array $conf = array()) {
45 45

  
46 46
		$lineThickness = isset($conf['lineThickness.'])
47 47
			? $this->cObj->stdWrap($conf['lineThickness'], $conf['lineThickness.'])