Version 3.4.8

upload/admin/sources/classes/output/publicOutput.php

@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Public output methods
- * Last Updated: $Date: 2013-05-20 16:38:23 -0400 (Mon, 20 May 2013) $
+ * Last Updated: $Date: 2015-05-11 05:07:45 -0400 (Mon, 11 May 2015) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: stuarts $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/company/standards.php#license
  * @package		IP.Board
  * @link		http://www.invisionpower.com
  * @since		Who knows...
- * @version		$Revision: 12261 $
+ * @version		$Revision: 12638 $
  *
  */
 
@@ -1938,6 +1938,9 @@ class output
 				case 'http':
 					$base = str_replace( 'https://', 'http://', $this->settings['base_url'] );
 				break;
+				case 'preferHttps':
+					$base = $this->isHTTPS ? str_replace( 'http://', 'https://', $this->settings['base_url'] ) : str_replace( 'https://', 'http://', $this->settings['base_url'] );
+				break;
 			}
 		}
 		
@@ -2591,7 +2594,7 @@ class output
 			
 				/* preg_match is to prevent redirecting in older Android and IE browsers (Does not affect IE10).  They will take %c5%82, break down to separate characters and re-encode as %c3%85%c2%82, creating
 					an infinite redirect loop.  Ticket 848516, 853009 and @link http://community.invisionpower.com/resources/bugs.html/_/ip-board/urls-with-multi-byte-characters-causing-infinite-redirect-on-old-android-devices-r41601 */
-				if ( $base_url . $_toTest != $newurl AND !preg_match( "/(android 2|msie)/i", $this->member->user_agent ) )
+				if ( $base_url . $_toTest != $newurl AND !preg_match( "/(android 2|msie|trident|safari)/i", $this->member->user_agent ) )
 				{
 					/* Load information file */ 
 					if( $storeData['app'] && is_file( IPSLib::getAppDir( $storeData['app'] ) . '/extensions/furlRedirect.php' ) )
@@ -3528,6 +3531,15 @@ class output
 	 */
     public function showError( $message, $code=0, $logError=FALSE, $logExtra='', $header=401 )
     {
+    	//-----------------------------------------
+    	// Wipe out the saved post data
+    	//-----------------------------------------
+
+    	if( $_POST['Post'] )
+    	{
+    		$_POST['Post']	= NULL;
+    	}
+
     	//-----------------------------------------
     	// INIT
     	//-----------------------------------------