Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -3,10 +3,10 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Item Marking
|
||||
* Owner: Matt "Oh Lord, why did I get assigned this?" Mecham
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-11-06 15:14:35 -0500 (Tue, 06 Nov 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
@@ -15,7 +15,7 @@
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 9th March 2005 11:03
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 11565 $
|
||||
*
|
||||
* @todo [Future] Perhaps find more ways to reduce the size of items_read
|
||||
* @todo [Future] Maybe add an IN_DEV tool to warn when markers have been cancelled out / size drastically reduced
|
||||
@@ -230,7 +230,7 @@ class classItemMarking
|
||||
/* Clean up */
|
||||
if ( $this->_cookie[ 'itemMarking_' . $_app . '_items'] )
|
||||
{
|
||||
$_items = ( is_array( $this->_cookie[ 'itemMarking_' . $_app . '_items'] ) ) ? $this->_cookie[ 'itemMarking_' . $_app . '_items'] : unserialize( $this->_cookie[ 'itemMarking_' . $_app . '_items'] );
|
||||
$_items = ( is_array( $this->_cookie[ 'itemMarking_' . $_app . '_items'] ) ) ? $this->_cookie[ 'itemMarking_' . $_app . '_items'] : json_decode( $this->_cookie[ 'itemMarking_' . $_app . '_items'], true );
|
||||
|
||||
$this->_cookieCounter = 0;
|
||||
arsort( $_items, SORT_NUMERIC );
|
||||
@@ -241,10 +241,10 @@ class classItemMarking
|
||||
|
||||
IPSDebug::addMessage( 'Cookie loaded: itemMarking_' . $_app . '_items' . ' - ' . serialize( $_newData ) );
|
||||
IPSDebug::addMessage( 'Cookie loaded: itemMarking_' . $_app . ' - ' . serialize( $_value ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
IPSDebug::setMemoryDebugFlag( "Topic markers initialized", $_NOW );
|
||||
}
|
||||
|
||||
@@ -261,7 +261,7 @@ class classItemMarking
|
||||
{
|
||||
if ( is_array( $data ) )
|
||||
{
|
||||
$data = serialize( $data );
|
||||
$data = json_encode( $data );
|
||||
}
|
||||
|
||||
$data = strtr( base64_encode( addslashes( @gzcompress( $data ) ) ), '+/=', '-_,' );
|
||||
@@ -278,7 +278,7 @@ class classItemMarking
|
||||
* @return string Uncompressed data
|
||||
*/
|
||||
protected function _inflateCookie( $data )
|
||||
{
|
||||
{
|
||||
/* already inflated? */
|
||||
if ( ! $data OR is_array( $data ) )
|
||||
{
|
||||
@@ -288,11 +288,8 @@ class classItemMarking
|
||||
if ( $this->_canCompressCookies )
|
||||
{
|
||||
$data = @gzuncompress( stripslashes( base64_decode( strtr( $data, '-_,', '+/=' ) ) ) );
|
||||
|
||||
if ( substr( $data, 0, 2 ) == 'a:' )
|
||||
{
|
||||
$data = unserialize( $data );
|
||||
}
|
||||
|
||||
$data = json_decode( $data, true );
|
||||
}
|
||||
|
||||
return $data;
|
||||
|
||||
Reference in new issue
Block a user