Version 4.5.0

applications/core/setup/upg_101024/upgrade.php

@@ -11,7 +11,7 @@
 namespace IPS\core\setup\upg_101024;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -41,7 +41,7 @@ class _Upgrade
 		/* Try to prevent timeouts to the extent possible */
 		$cutOff			= \IPS\core\Setup\Upgrade::determineCutoff();
 		
-		foreach( \IPS\Db::i()->select( '*', 'core_tags_cache', null, 'tag_cache_date ASC', array( $limit, 500 ) ) as $cache )
+		foreach( \IPS\Db::i()->select( '*', 'core_tags_cache', null, 'tag_cache_key ASC', array( $limit, 500 ) ) as $cache )
 		{
 			if( $cutOff !== null AND time() >= $cutOff )
 			{
@@ -54,7 +54,7 @@ class _Upgrade
 			$results = @unserialize( $cache['tag_cache_text'] );
 			$update  = null;
 
-			if( is_array( $results ) AND count( $results ) )
+			if( \is_array( $results ) AND \count( $results ) )
 			{
 				$update = $results;
 			}
@@ -63,11 +63,11 @@ class _Upgrade
 				/* It may be json_encoded...which is normally fine, but a previous bug may have resulted in the 'tags' array being two levels deep */
 				$results = @json_decode( $cache['tag_cache_text'], true );
 
-				if( is_array( $results ) AND count( $results ) )
+				if( \is_array( $results ) AND \count( $results ) )
 				{
-					if( isset( $results['tags'] ) AND is_array( $results['tags'] ) )
+					if( isset( $results['tags'] ) AND \is_array( $results['tags'] ) )
 					{
-						if( isset( $results['tags'][0] ) AND is_array( $results['tags'][0] ) )
+						if( isset( $results['tags'][0] ) AND \is_array( $results['tags'][0] ) )
 						{
 							$update = array( 'tags' => $results['tags'][0], 'prefix' => $results['prefix'] );
 						}