inretio
/
WordPress-Plugin-Boilerplate
mirror of https://github.com/inretio/WordPress-Plugin-Boilerplate
1
0
Fork 0
Code Issues Releases Wiki Activity

merge conflict resolution

This commit is contained in:
Tom McFarlin 2013-11-08 16:53:27 -05:00
parent fce6701179
commit f293c94419
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin-name/plugin-name.php
View File

@ -42,6 +42,13 @@ if ( ! defined( 'WPINC' ) ) {
*/
require_once( plugin_dir_path( __FILE__ ) . '/public/class-plugin-name.php' );
$class_plugin_name_php = 'class-plugin-name.php';
$plugin_name = 'Plugin_Name';
$class_plugin_name_admin_php = 'class-plugin-name-admin.php';
$plugin_name_admin = 'Plugin_Name_admin';
require_once( plugin_dir_path( __FILE__ ) . "/public/$class_plugin_name_php" );
/*
* Register hooks that are fired when the plugin is activated or deactivated.
* When the plugin is deleted, the uninstall.php file is loaded.