Changeset 3380056

Timestamp:

10/17/2025 11:23:08 AM (5 months ago)

Author:

aristath

Message:

Fix plugin name

Location:

wordpress-reset

Files:

• tags/1.5.0/includes/class-wpre-reset.php (modified) (4 diffs)
• tags/1.5.0/readme.txt (modified) (1 diff)
• tags/1.5.0/wordpress-reset.php (modified) (1 diff)
• trunk/includes/class-wpre-reset.php (modified) (4 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/wordpress-reset.php (modified) (1 diff)

wordpress-reset/tags/1.5.0/includes/class-wpre-reset.php

@@ -86 +86 @@
                     $database_file = FQDB;
                 } elseif ( defined( 'DB_DIR' ) && defined( 'DB_FILE' ) ) {
-                    $database_file = DB_DIR . DB_FILE;
+                    $database_file = \trailingslashit( DB_DIR ) . DB_FILE;
                 } elseif ( defined( 'DB_FILE' ) ) {
                     // Fallback: try WP_CONTENT_DIR/database/ directory.
-                    $database_file = WP_CONTENT_DIR . '/database/' . DB_FILE;
+                    $database_file = \trailingslashit( WP_CONTENT_DIR ) . 'database/' . DB_FILE;
                 } else {
                     // Final fallback: default SQLite location.
-                    $database_file = WP_CONTENT_DIR . '/database/.ht.sqlite';
+                    $database_file = \trailingslashit( WP_CONTENT_DIR ) . 'database/.ht.sqlite';
                 }
 
@@ -280 +280 @@
     /**
      * Enqueue admin scripts and styles.
-     *
-     * @access public
-     * @return void
-     */
-    public function admin_js(): void {
+     * Only loads on the plugin's admin page.
+     *
+     * @access public
+     * @param string $hook The current admin page hook.
+     * @return void
+     */
+    public function admin_enqueue_scripts( string $hook ): void {
+        // Only load on our plugin's page (Tools > Reset).
+        if ( 'tools_page_wordpress-reset' !== $hook ) {
+            return;
+        }
+
         // Get plugin version from plugin headers.
         // Load required WordPress functions if not available.
@@ -330 +337 @@
     public function add_page(): void {
         if ( \current_user_can( 'activate_plugins' ) && \function_exists( 'add_management_page' ) ) {
-            $hook = \add_management_page(
+            \add_management_page(
                 \esc_html__( 'Reset', 'wordpress-reset' ),
                 \esc_html__( 'Reset', 'wordpress-reset' ),
@@ -337 +344 @@
                 array( $this, 'admin_page' )
             );
-            \add_action( "admin_print_scripts-{$hook}", array( $this, 'admin_js' ) );
+            \add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
         }
     }

wordpress-reset/tags/1.5.0/readme.txt

@@ -1 @@
-=== WordPress Reset ===
+=== WP Database Reset ===
 Contributors: aristath, sivel
 Donate Link: http://aristath.github.io/donate

wordpress-reset/tags/1.5.0/wordpress-reset.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin Name: WP Reset
+ * Plugin Name: WP Database Reset
  * Plugin URI: http://sivel.net/wordpress/wordpress-reset/
- * Description: Resets the WordPress database back to it's defaults. Deletes all customizations and content. Does not modify files only resets the database.
+ * Description: Resets the WordPress database back to its defaults. Deletes all customizations and content. Does not modify files only resets the database.
  * Author: Aristeidis Stathopoulos, Matt Martz
  * Version: 1.5.0

wordpress-reset/trunk/includes/class-wpre-reset.php

@@ -86 +86 @@
                     $database_file = FQDB;
                 } elseif ( defined( 'DB_DIR' ) && defined( 'DB_FILE' ) ) {
-                    $database_file = DB_DIR . DB_FILE;
+                    $database_file = \trailingslashit( DB_DIR ) . DB_FILE;
                 } elseif ( defined( 'DB_FILE' ) ) {
                     // Fallback: try WP_CONTENT_DIR/database/ directory.
-                    $database_file = WP_CONTENT_DIR . '/database/' . DB_FILE;
+                    $database_file = \trailingslashit( WP_CONTENT_DIR ) . 'database/' . DB_FILE;
                 } else {
                     // Final fallback: default SQLite location.
-                    $database_file = WP_CONTENT_DIR . '/database/.ht.sqlite';
+                    $database_file = \trailingslashit( WP_CONTENT_DIR ) . 'database/.ht.sqlite';
                 }
 
@@ -280 +280 @@
     /**
      * Enqueue admin scripts and styles.
-     *
-     * @access public
-     * @return void
-     */
-    public function admin_js(): void {
+     * Only loads on the plugin's admin page.
+     *
+     * @access public
+     * @param string $hook The current admin page hook.
+     * @return void
+     */
+    public function admin_enqueue_scripts( string $hook ): void {
+        // Only load on our plugin's page (Tools > Reset).
+        if ( 'tools_page_wordpress-reset' !== $hook ) {
+            return;
+        }
+
         // Get plugin version from plugin headers.
         // Load required WordPress functions if not available.
@@ -330 +337 @@
     public function add_page(): void {
         if ( \current_user_can( 'activate_plugins' ) && \function_exists( 'add_management_page' ) ) {
-            $hook = \add_management_page(
+            \add_management_page(
                 \esc_html__( 'Reset', 'wordpress-reset' ),
                 \esc_html__( 'Reset', 'wordpress-reset' ),
@@ -337 +344 @@
                 array( $this, 'admin_page' )
             );
-            \add_action( "admin_print_scripts-{$hook}", array( $this, 'admin_js' ) );
+            \add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
         }
     }

wordpress-reset/trunk/readme.txt

@@ -1 @@
-=== WordPress Reset ===
+=== WP Database Reset ===
 Contributors: aristath, sivel
 Donate Link: http://aristath.github.io/donate

wordpress-reset/trunk/wordpress-reset.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin Name: WP Reset
+ * Plugin Name: WP Database Reset
  * Plugin URI: http://sivel.net/wordpress/wordpress-reset/
- * Description: Resets the WordPress database back to it's defaults. Deletes all customizations and content. Does not modify files only resets the database.
+ * Description: Resets the WordPress database back to its defaults. Deletes all customizations and content. Does not modify files only resets the database.
  * Author: Aristeidis Stathopoulos, Matt Martz
  * Version: 1.5.0