Merge branch 'develop'

README.md

@@ -1,17 +1,41 @@
+[![WP Rollback](https://wprollback.com/wp-content/uploads/2024/01/WP-Rollback-GitHub.jpg)](https://wprollback.com)
+
 # WP Rollback
-Quickly and easily rollback any theme or plugin on WordPress.org to a previous version without any of the manual fuss. Works just like the plugin updater, except you're downgrading to a specific version. No need for manually downloading and FTPing up the files, this plugin takes care of that for you.
+
+Effortlessly rollback (or downgrade, as some may call it) any theme or plugin from WordPress.org to a previous version with WP Rollback. It's as simple as using the plugin updater, but instead, you downgrade to a specific version. Forget the hassle of manual downloads and FTP uploads; this plugin streamlines the process for you.
 
 ## Important: Usage Disclaimer
 
-We strongly recommend you perform a test rollback on a staging site and create a complete backup of your WordPress files and database prior to performing a rollback. **We are not responsible for any misuse, deletions, white screens, fatal errors, or any other issue arising from using this plugin**.
+Before performing a rollback, we highly recommend conducting a test on a staging site and creating a full backup of your WordPress files and database. **Please note: We are not liable for any issues such as data loss, white screens, fatal errors, or other problems that may arise from using this plugin**.
 
 ## Download
-You can download the latest development version from here. Stable versions can be found at the [WordPress Repository](https://wordpress.org/plugins/wp-rollback), or by searching in your WordPress Dashboard in the "Plugins > Add New" area.
+
+For stable releases, visit the [WordPress Repository](https://wordpress.org/plugins/wp-rollback). You can also find them in your WordPress Dashboard under "Plugins > Add New." For development versions, see the contribution section below on how to clone this repo and start using the latest updates.
 
 ## Support
-We answer all support requests at the [WordPress Repository](https://wordpress.org/support/plugin/wp-rollback). If you have feature requests or bugs or want to contribute, feel free to do that here.
+
+Have questions or need assistance? Post all your support requests on the [WordPress Repository support page for WP Rollback](https://wordpress.org/support/plugin/wp-rollback). If you'd like to report bugs, request features, or contribute, we welcome your input!
 
 ## Documentation
-WP Rollback was created to be as intuitive to the natural WordPress experience as possible. There are no settings at all. We believe that once you activate WP Rollback you'll quickly discover exactly how it works without question.
+
+Designed for seamless integration with the WordPress interface, WP Rollback is straightforward and setting-free. We're confident that its functionality will be apparent and intuitive right after activation.
 
 [Read the WP Rollback Documentation](https://github.com/impress-org/wp-rollback/wiki)
+
+## Contributing
+
+We appreciate contributions from the community! To contribute:
+
+1. **Fork the Repository**: Click the 'Fork' button at the top right of this page to create your own copy of this repository.
+
+2. **Clone Your Fork**: Clone your fork to your local machine. This can be done via the command line with `git clone https://github.com/DevinWalker/wp-rollback.git`. Make sure you clone it to the `wp-content/plugins` directory of your WordPress installation.
+
+3. **Start Development**: Run `npm install` to install all dependencies. Then, run `npm start` to start the process. This will watch for changes to the JS and SCSS files and compile them automatically.
+
+4. **Create a New Branch**: Before making your changes, switch to a new branch with `git checkout -b your-branch-name`.
+
+5. **Make Your Changes**: Implement your changes, enhancements, or bug fixes.
+
+6. **Commit and Push**: Commit your changes with a clear commit message and push them to your fork with `git push origin your-branch-name`.
+
+7. **Submit a Pull Request (PR)**: Go to the original WP Rollback repository and click 'New pull request'. Choose your fork and branch, then submit the pull request. Provide a decent PR description explaining the changes you made and we'll review your PR and merge it if it contributes positively to the project!

readme.txt

@@ -1,11 +1,11 @@
 === WP Rollback - Rollback Plugins and Themes ===
 Contributors: dlocc, drrobotnik, webdevmattcrom, givewp
 Tags: rollback, revert, downgrade, version, plugins, themes, version, versions, backup, backups, revision, revisions
-Requires at least: 4.8
+Requires at least: 5.0
 Donate Link: https://givewp.com/
 Tested up to: 6.5
 Requires PHP: 7.4
-Stable tag: 2.0.5
+Stable tag: 2.0.6
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -106,6 +106,9 @@ This is the first version of this plugin. It is a tool for your convenience. Rol
 
 == Changelog ==
 
+= 2.0.6 =
+Fix: The release corrects the paths used in plugin file includes and requires. The unnecessary forward slashes at the start of each file path have been removed. This change ensures proper file inclusion and requirement, avoiding potential issues with file not found errors.
+
 = 2.0.5 =
 * New: In this version we've brought back the "trunk" option to rollback to. This allows plugin or theme developers who use trunk for beta testing to rollback to the latest trunk version. Thanks, @megamenu for suggesting this be brought back.
 * Fix: Refactored how plugin avatar images are checked so that all available image types and sizes are checked. This resolves an issue where some plugins would not display an avatar image.

wp-rollback.php

@@ -5,7 +5,7 @@
  * Description: Rollback (or forward) any WordPress.org plugin, theme or block like a boss.
  * Author: WP Rollback
  * Author URI: https://wprollback.com/
- * Version: 2.0.5
+ * Version: 2.0.6
  * Text Domain: wp-rollback
  * Domain Path: /languages
  *
@@ -107,7 +107,7 @@ public static function instance(): ?WP_Rollback {
                     self::$instance->setup_constants();
 
                     // TODO: Create separate includes method.
-                    include_once WP_ROLLBACK_PLUGIN_DIR . '/src/class-rollback-multisite-compatibility.php';
+                    include_once WP_ROLLBACK_PLUGIN_DIR . 'src/class-rollback-multisite-compatibility.php';
 
                     self::$instance->hooks();
 
@@ -223,7 +223,7 @@ public function scripts( $hook ): void {
 
             // Theme's listing page JS
             if ( 'themes.php' === $hook && !is_multisite() ) {
-                $theme_script_asset = require WP_ROLLBACK_PLUGIN_DIR . '/build/themes.asset.php';
+                $theme_script_asset = require WP_ROLLBACK_PLUGIN_DIR . 'build/themes.asset.php';
 
                 wp_enqueue_script(
                     'wp-rollback-themes-script',
@@ -252,7 +252,7 @@ public function scripts( $hook ): void {
                 return;
             }
 
-            $script_asset = require WP_ROLLBACK_PLUGIN_DIR . '/build/admin.asset.php';
+            $script_asset = require WP_ROLLBACK_PLUGIN_DIR . 'build/admin.asset.php';
 
             wp_enqueue_script( 'updates' );
             wp_enqueue_script(
@@ -288,7 +288,7 @@ public function scripts( $hook ): void {
                 'wp-rollback-plugin-admin',
                 plugins_url( 'build/admin.css', WP_ROLLBACK_PLUGIN_FILE ),
                 [ 'wp-components' ],
-                filemtime( WP_ROLLBACK_PLUGIN_DIR . '/build/admin.css' )
+                filemtime( WP_ROLLBACK_PLUGIN_DIR . 'build/admin.css' )
             );
         }
 
@@ -325,7 +325,7 @@ public function load_textdomain() {
         }
 
         public function register_rest_route() {
-            include WP_ROLLBACK_PLUGIN_DIR . '/src/class-rollback-api-requests.php';
+            include WP_ROLLBACK_PLUGIN_DIR . 'src/class-rollback-api-requests.php';
 
             register_rest_route( 'wp-rollback/v1', '/fetch-info/', [
                 'methods'             => 'GET',
@@ -378,12 +378,12 @@ public function html(): void {
 
             if ( ! empty( $args['plugin_version'] ) ) {
                 // Plugin: rolling back.
-                include WP_ROLLBACK_PLUGIN_DIR . '/src/class-rollback-plugin-upgrader.php';
-                include WP_ROLLBACK_PLUGIN_DIR . '/src/rollback-action.php';
+                include WP_ROLLBACK_PLUGIN_DIR . 'src/class-rollback-plugin-upgrader.php';
+                include WP_ROLLBACK_PLUGIN_DIR . 'src/rollback-action.php';
             } elseif ( ! empty( $args['theme_version'] ) ) {
                 // Theme: rolling back.
-                include WP_ROLLBACK_PLUGIN_DIR . '/src/class-rollback-theme-upgrader.php';
-                include WP_ROLLBACK_PLUGIN_DIR . '/src/rollback-action.php';
+                include WP_ROLLBACK_PLUGIN_DIR . 'src/class-rollback-theme-upgrader.php';
+                include WP_ROLLBACK_PLUGIN_DIR . 'src/rollback-action.php';
             } else {
                 // Rollback main screen.
                 echo '<div id="root-wp-rollback-admin"></div>';