Bug #21202 » class.tx_felogin_pi1_6566.patch

Administrator Admin, 2009-11-26 18:30

View differences:

class.tx_felogin_pi1.php (working copy)
104 104
			$this->redirectUrl = $this->processRedirect();
105 105
		}
106 106

  
107

  
107
			// Process the redirect
108
		if (($this->logintype === 'login' || $this->logintype === 'logout') && $this->redirectUrl && !$this->noRedirect) {
109
			if (!$GLOBALS['TSFE']->fe_user->cookieId) {
110
				$content .= '<p style="color:red; font-weight:bold;">' . $this->pi_getLL('cookie_warning', '', 1) . '</p>';
111
			} else {
112
				t3lib_utility_Http::redirect($this->redirectUrl);
113
			}
114
		}
115
		
108 116
			// What to display
109 117
		$content='';
110 118
		if ($this->piVars['forgot']) {
......
119 127
			}
120 128
		}
121 129

  
122

  
123

  
124
			// Process the redirect
125
		if (($this->logintype === 'login' || $this->logintype === 'logout') && $this->redirectUrl && !$this->noRedirect) {
126
			if (!$GLOBALS['TSFE']->fe_user->cookieId) {
127
				$content .= '<p style="color:red; font-weight:bold;">' . $this->pi_getLL('cookie_warning', '', 1) . '</p>';
128
			} else {
129
				t3lib_utility_Http::redirect($this->redirectUrl);
130
			}
131
		}
132 130
		return $this->conf['wrapContentInBaseClass'] ? $this->pi_wrapInBaseClass($content) : $content;
133 131

  
134 132
	}
(1-1/2)