Merge pull request Kunena#432 from mahagr/master

Fix Kunena#426, Kunena#428 and Mirage html issues
coder4life · Mar 24, 2012 · 147cc08 · 147cc08
2 parents d375f29 + 17cc169
commit 147cc08
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/administrator/components/com_kunena/libraries/upload/upload.php b/administrator/components/com_kunena/libraries/upload/upload.php
@@ -168,6 +168,7 @@ protected function sendResponse() {
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");
 		while(@ob_end_clean());
+		ob_start();
 		$error = $this->getError();
 		if ($error) {
 			jexit('{"error" : '.$error.'", "id" : "id"}');

diff --git a/components/com_kunena/controllers/user.php b/components/com_kunena/controllers/user.php
@@ -216,7 +216,7 @@ function login() {
 	}
 
 	function logout() {
-		if(!JRequest::checkToken()) {
+		if(!JRequest::checkToken('request')) {
 			$this->app->redirect ( JRequest::getVar ( 'HTTP_REFERER', JURI::base ( true ), 'server' ), COM_KUNENA_ERROR_TOKEN, 'error' );
 		}
 

diff --git a/components/com_kunena/template/mirage/html/common/logout.php b/components/com_kunena/template/mirage/html/common/logout.php
@@ -34,7 +34,7 @@
 					<button class="kbutton button-type-standard" type="submit"><span><?php //echo JText::_('COM_KUNENA_PROFILEBOX_LOGOUT') ?></span></button>
 				</fieldset>
 			</form>-->
-			<a class="link" href="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=user&task=logout') ?>">
+			<a class="link" href="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=user&task=logout&'.JUtility::getToken().'=1') ?>" title="<?php echo JText::_('COM_KUNENA_PROFILEBOX_LOGOUT') .' :: '. JText::_('COM_KUNENA_VIEW_COMMON_LOGOUT_LONG') ?>">
 				<?php echo JText::_('COM_KUNENA_PROFILEBOX_LOGOUT') ?>
 			</a>
 		</li>

diff --git a/components/com_kunena/template/mirage/html/search/default.php b/components/com_kunena/template/mirage/html/search/default.php
@@ -23,8 +23,8 @@
 ?>
 <div class="kmodule search_adv">
 	<form action="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=search') ?>" name="adminForm" id="adminForm" method="post">
-	<input type="hidden" name="task" value="results" />
-	<?php echo JHTML::_( 'form.token' ); ?>
+		<input type="hidden" name="task" value="results" />
+		<?php echo JHTML::_( 'form.token' ); ?>
 		<div class="kbox-wrapper kbox-full">
 			<div class="search_adv-kbox kbox kbox-full kbox-color kbox-border kbox-border_radius kbox-border_radius-vchild kbox-shadow">
 				<div class="headerbox-wrapper kbox-full">
@@ -110,7 +110,6 @@
 						</div>
 					</div>
 				</div>
-				</form>
 			</div>
 		</div>
 	</form>