diff --git a/inc/lib/Cache.php b/inc/lib/Cache.php index 862606d..642a55f 100644 --- a/inc/lib/Cache.php +++ b/inc/lib/Cache.php @@ -348,7 +348,6 @@ public function get( $key ) { $name = $this->parseKey( $key ); $data = false; - // Various Modes / Actions switch ( $this->options[ 'mode' ] ) { @@ -568,13 +567,11 @@ public function delete( $key ) { $deleted = apc_delete( $name ); break; - // APCu extension uses its own calls case 'apcu': $deleted = apcu_delete( $name ); break; - // Redis method case 'memcache': case 'memcached': @@ -582,7 +579,6 @@ public function delete( $key ) { $deleted = $this->object->delete( $name ); break; - // Default is always disk cache default: @@ -598,16 +594,12 @@ public function delete( $key ) { } // If cache key was successfully deleted, also clean it from cache_store - if ( $deleted === true ) { - - // Ignore cache_store, should never be deleted - if ( $key !== 'cache_store' ) { - $this->stack( 'delete', $key ); - } - + // Ignore cache_store, should never be deleted + if ( ( $deleted === true ) && $key !== 'cache_store' ) { + $this->stack( 'delete', $key ); } - return false; + return $deleted; } diff --git a/package.json b/package.json index 7dec154..08a8796 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "url": "git+https://github.com/Jackysi/PawTunes.git" }, "license": "MPL-2.0", - "version": "1.0.1", + "version": "1.0.2", "type": "module", "scripts": { "dev": "gulp dev", diff --git a/panel/lib/API/Updates.php b/panel/lib/API/Updates.php index abbad4c..14b0067 100644 --- a/panel/lib/API/Updates.php +++ b/panel/lib/API/Updates.php @@ -77,6 +77,8 @@ public function __invoke() { $this->downloadUpdate(); $this->extractUpdate(); + + $this->sendSSE( "
Processing installation...
" ); $this->postUpdate( $this->path ); // Delete zip file & temp file diff --git a/src/panel/js/panel.js b/src/panel/js/panel.js index 96f7465..83d17aa 100644 --- a/src/panel/js/panel.js +++ b/src/panel/js/panel.js @@ -220,7 +220,7 @@ function shouldUpdate( serverVersion, localVersion, segments = 3 ) { `
Running a post-update script, please do not interrupt this process... -
Loading, please wait...
+
Processing...
` );