Changeset 5317

Timestamp:

03/10/2014 03:24:18 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Don't allow build or src in basename in bbPress:setup_globals(). Fixes problems with activation hooks. Fixes #2559. Props DJPaul.

File:

• trunk/src/bbpress.php (modified) (1 diff)

trunk/src/bbpress.php

@@ -196 +196 @@
         /** Paths *************************************************************/
 
-        // Setup some base path and URL information
+        // Base name
         $this->file       = __FILE__;
-        $this->basename   = apply_filters( 'bbp_plugin_basename',  plugin_basename( $this->file ) );
-        $this->plugin_dir = apply_filters( 'bbp_plugin_dir_path',  plugin_dir_path( $this->file ) );
-        $this->plugin_url = apply_filters( 'bbp_plugin_dir_url',   plugin_dir_url ( $this->file ) );
+        $this->basename   = apply_filters( 'bbp_plugin_basename', str_replace( array( 'build/', 'src/' ), '', plugin_basename( $this->file ) ) );
+
+        // Path and URL
+        $this->plugin_dir = apply_filters( 'bbp_plugin_dir_path', plugin_dir_path( $this->file ) );
+        $this->plugin_url = apply_filters( 'bbp_plugin_dir_url',  plugin_dir_url ( $this->file ) );
 
         // Includes