<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2803] sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt: WordCamp Post Type: There's no reason to go through five filters to define a constant.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2803">2803</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2803","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-25 10:56:40 +0000 (Fri, 25 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Post Type: There's no reason to go through five filters to define a constant.
Clean up a lot of the old over-engineered code, remove
unused actions and filters, actions that are wrappers for
other core actions and other things.
If your code relies on any of these actions and filters,
feel free to bring it back, or better yet change the
action/filter name to the one provided by core.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptloaderphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamploaderphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php 2016-03-25 10:17:51 UTC (rev 2802)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php 2016-03-25 10:56:40 UTC (rev 2803)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,6 +14,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Note: Loaded does NOT mean initialized
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WCPT_VERSION', '0.1' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WCPT_DIR', plugin_dir_path( __FILE__ ) );
+define( 'WCPT_URL', plugins_url( '/', __FILE__ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !class_exists( 'WCPT_Loader' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,103 +31,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The main WordCamp Post Type loader
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_loader () {
- /** COMPONENT HOOKS ***************************************************/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function __construct() {
+ add_action( 'plugins_loaded', array( $this, 'core_admin' ) );
+ add_action( 'init', array( $this, 'core_text_domain' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Attach the wcpt_loaded action to the WordPress plugins_loaded action.
- add_action( 'plugins_loaded', array ( $this, 'component_loaded' ) );
-
- // Attach the wcpt_init to the WordPress init action.
- add_action( 'init', array ( $this, 'component_init' ) );
-
- // Attach constants to wcpt_loaded.
- add_action( 'wcpt_loaded', array ( $this, 'component_constants' ) );
-
- // Attach includes to wcpt_loaded.
- add_action( 'wcpt_loaded', array ( $this, 'component_includes' ) );
-
- // Attach post type registration to wcpt_init.
- add_action( 'wcpt_init', array ( $this, 'component_post_types' ) );
-
- // Attach tag registration wcpt_init.
- add_action( 'wcpt_init', array ( $this, 'component_taxonomies' ) );
-
- /** CORE HOOKS ********************************************************/
-
- // Core Constants
- add_action( 'wcpt_started', array ( $this, 'core_constants' ) );
-
- // Core Includes
- add_action( 'wcpt_started', array ( $this, 'core_includes' ) );
-
- // Core Admin
- add_action( 'wcpt_loaded', array ( $this, 'core_admin' ) );
-
- // Attach theme directory wcpt_loaded.
- add_action( 'wcpt_loaded', array ( $this, 'core_theme_directory' ) );
-
- // Attach textdomain to wcpt_init.
- add_action( 'wcpt_init', array ( $this, 'core_text_domain' ) );
-
- // Register WordCamp Post Type activation sequence
- register_activation_hook( __FILE__, array( $this, 'activation' ) );
-
- // Register WordCamp Post Type deactivation sequence
- register_deactivation_hook( __FILE__, array( $this, 'deactivation' ) );
-
- // Get this party started
- do_action( 'wcpt_started' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->includes();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * core_constants ()
- *
- * WordCamp Core Constants
- */
- function core_constants () {
- // Turn debugging on/off
- if ( !defined( 'WCPT_DEBUG' ) )
- define( 'WCPT_DEBUG', WP_DEBUG );
-
- // Default slug for post type
- if ( !defined( 'WCPT_THEMES_DIR' ) )
- define( 'WCPT_THEMES_DIR', apply_filters( 'wcpt_themes_dir', WP_PLUGIN_DIR . '/wcpt-themes' ) );
-
- // WordCamp Post Type root directory
- define( 'WCPT_DIR', WP_PLUGIN_DIR . '/wcpt' );
- define( 'WCPT_URL', plugins_url( $path = '/wcpt' ) );
-
- // Images URL
- define( 'WCPT_IMAGES_URL', WCPT_URL . '/wcpt-images' );
- }
-
- /**
- * core_includes ()
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * WordCamp Core File Includes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function core_includes () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function includes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Load the files
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once ( WCPT_DIR . '/wcpt-functions.php' );
- require_once ( WCPT_DIR . '/wcpt-wordcamp/wordcamp-loader.php' );
- require_once ( WCPT_DIR . '/applications/tracker.php' );
- require_once ( WCPT_DIR . '/applications/wordcamp.php' );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once ( WCPT_DIR . 'wcpt-functions.php' );
+ require_once ( WCPT_DIR . 'wcpt-wordcamp/wordcamp-loader.php' );
+ require_once ( WCPT_DIR . 'applications/tracker.php' );
+ require_once ( WCPT_DIR . 'applications/wordcamp.php' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Require admin files.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once ( WCPT_DIR . '/wcpt-admin.php' );
- require_once ( WCPT_DIR . '/wcpt-wordcamp/wordcamp-admin.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once ( WCPT_DIR . 'wcpt-admin.php' );
+ require_once ( WCPT_DIR . 'wcpt-wordcamp/wordcamp-admin.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function core_admin () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function core_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Quick admin check
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_admin() )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create admin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['wcpt_admin'] = new WCPT_Admin();
- $GLOBALS['wordcamp_admin'] = new WordCamp_Admin();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['wcpt_admin'] = new WCPT_Admin;
+ $GLOBALS['wordcamp_admin'] = new WordCamp_Admin;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,145 +70,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Load the translation file for current language
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function core_text_domain () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function core_text_domain() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = apply_filters( 'wcpt_textdomain', get_locale() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mofile = WCPT_DIR . "wcpt-languages/wcpt-$locale.mo";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mofile = WCPT_DIR . "/wcpt-languages/wcpt-$locale.mo";
-
</del><span class="cx" style="display: block; padding: 0 10px"> load_textdomain( 'wcpt', $mofile );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * Text domain has been loaded
- */
- do_action( 'wcpt_load_textdomain' );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * core_theme_directory ()
- *
- * Sets up the WordCamp Post Type theme directory to use in WordPress
- *
- * @since WordCamp Post Type (0.1)
- * @uses register_theme_directory
- */
- function core_theme_directory () {
- register_theme_directory( WCPT_THEMES_DIR );
-
- /**
- * Theme directory has been registered
- */
- do_action( 'wcpt_register_theme_directory' );
- }
-
- /**
- * activation ()
- *
- * Runs on WordCamp Post Type activation
- *
- * @since WordCamp Post Type (0.1)
- */
- function activation () {
- register_uninstall_hook( __FILE__, array( $this, 'uninstall' ) );
-
- /**
- * WordCamp Post Type has been activated
- */
- do_action( 'wcpt_activation' );
- }
-
- /**
- * deactivation ()
- *
- * Runs on WordCamp Post Type deactivation
- *
- * @since WordCamp Post Type (0.1)
- */
- function deactivation () {
- do_action( 'wcpt_deactivation' );
- }
-
- /**
- * uninstall ()
- *
- * Runs when uninstalling WordCamp Post Type
- *
- * @since WordCamp Post Type (0.1)
- */
- function uninstall () {
- do_action( 'wcpt_uninstall' );
- }
-
- /**
- * component_constants ()
- *
- * Default component constants that can be overridden or filtered
- */
- function component_constants () {
- do_action( 'wcpt_constants' );
- }
-
- /**
- * component_includes ()
- *
- * Include required files
- *
- */
- function component_includes () {
- do_action( 'wcpt_includes' );
- }
-
- /**
- * component_loaded ()
- *
- * A WordCamp Post Type specific action to say that it has started its
- * boot strapping sequence. It's attached to the existing WordPress
- * action 'plugins_loaded' because that's when all plugins have loaded.
- *
- * @uses is_admin If in WordPress admin, load additional file
- * @uses do_action()
- */
- function component_loaded () {
- do_action( 'wcpt_loaded' );
- }
-
- /**
- * component_init ()
- *
- * Initialize WordCamp Post Type as part of the WordPress initilization process
- *
- * @uses do_action Calls custom action to allow external enhancement
- */
- function component_init () {
- do_action ( 'wcpt_init' );
- }
-
- /**
- * component_post_type ()
- *
- * Setup the post types and taxonomies
- */
- function component_post_types () {
- do_action ( 'wcpt_register_post_types' );
- }
-
- /**
- * component_taxonomies ()
- *
- * Register the built in WordCamp Post Type taxonomies
- *
- * @since WordCamp Post Type (0.1)
- *
- * @uses register_taxonomy()
- * @uses apply_filters()
- */
- function component_taxonomies () {
- do_action ( 'wcpt_register_taxonomies' );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // class_exists check
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load everything up
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wcpt_loader = new WCPT_Loader();
-$wordcamp_loader = new WordCamp_Loader();
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$wcpt_loader = new WCPT_Loader;
+$wordcamp_loader = new WordCamp_Loader;
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamploaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php 2016-03-25 10:17:51 UTC (rev 2802)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php 2016-03-25 10:56:40 UTC (rev 2803)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WCPT_POST_TYPE_ID', 'wordcamp' );
+define( 'WCPT_YEAR_ID', 'wordcamp_year' );
+define( 'WCPT_SLUG', 'wordcamps' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !class_exists( 'WordCamp_Loader' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,42 +17,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The main WordCamp Post Type loader
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wordcamp_loader () {
-
- // Attach constants to wcpt_loaded.
- add_action( 'wcpt_constants', array ( $this, 'constants' ) );
-
- // Attach includes to wcpt_includes.
- add_action( 'wcpt_includes', array ( $this, 'includes' ) );
-
- // Attach post type registration to wcpt_register_post_types.
- add_action( 'wcpt_register_post_types', array ( $this, 'register_post_types' ) );
-
- // Attach tag registration wcpt_register_taxonomies.
- //add_action( 'wcpt_register_taxonomies', array ( $this, 'register_taxonomies' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function __construct() {
+ add_action( 'plugins_loaded', array( $this, 'includes' ) );
+ add_action( 'init', array ( $this, 'register_post_types' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * constants ()
- *
- * Default component constants that can be overridden or filtered
- */
- function constants () {
-
- // The default post type ID
- if ( !defined( 'WCPT_POST_TYPE_ID' ) )
- define( 'WCPT_POST_TYPE_ID', apply_filters( 'wcpt_post_type_id', 'wordcamp' ) );
-
- // The default year ID
- if ( !defined( 'WCPT_YEAR_ID' ) )
- define( 'WCPT_YEAR_ID', apply_filters( 'wcpt_tag_id', 'wordcamp_year' ) );
-
- // Default slug for post type
- if ( !defined( 'WCPT_SLUG' ) )
- define( 'WCPT_SLUG', apply_filters( 'wcpt_slug', 'wordcamps' ) );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * includes ()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Include required files
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,14 +32,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function includes () {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load the files
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once ( WCPT_DIR . '/wcpt-wordcamp/wordcamp-template.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once ( WCPT_DIR . 'wcpt-wordcamp/wordcamp-template.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Quick admin check and load if needed
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once ( WCPT_DIR . '/wcpt-wordcamp/wordcamp-admin.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once ( WCPT_DIR . 'wcpt-wordcamp/wordcamp-admin.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once( WCPT_DIR . '/wcpt-wordcamp/wordcamp-new-site.php' );
- $GLOBALS['wordcamp_new_site'] = new WordCamp_New_Site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( WCPT_DIR . 'wcpt-wordcamp/wordcamp-new-site.php' );
+ $GLOBALS['wordcamp_new_site'] = new WordCamp_New_Site;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,54 +104,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * register_taxonomies ()
- *
- * Register the built in WordCamp Post Type taxonomies
- *
- * @since WordCamp Post Type (0.1)
- *
- * @uses register_taxonomy()
- * @uses apply_filters()
- */
- function register_taxonomies () {
-
- // Tag labels
- $tag_labels = array (
- 'name' => __( 'Years', 'wcpt' ),
- 'singular_name' => __( 'Year', 'wcpt' ),
- 'search_items' => __( 'Search Years', 'wcpt' ),
- 'popular_items' => __( 'Popular Years', 'wcpt' ),
- 'all_items' => __( 'All Years', 'wcpt' ),
- 'edit_item' => __( 'Edit Year', 'wcpt' ),
- 'update_item' => __( 'Update Year', 'wcpt' ),
- 'add_new_item' => __( 'Add Year', 'wcpt' ),
- 'new_item_name' => __( 'New Year', 'wcpt' ),
- );
-
- // Tag rewrite
- $tag_rewrite = array (
- 'slug' => 'year'
- );
-
- // Register the tag taxonomy
- register_taxonomy (
- WCPT_TAG_ID, // The tag ID
- WCPT_POST_TYPE_ID, // The post type ID
- apply_filters( 'wcpt_register_year',
- array (
- 'labels' => $tag_labels,
- 'rewrite' => $tag_rewrite,
- //'update_count_callback' => '_update_post_term_count',
- 'query_var' => 'wc-year',
- 'hierarchical' => false,
- 'public' => true,
- 'show_ui' => true,
- )
- )
- );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // class_exists check
</span></span></pre>
</div>
</div>
</body>
</html>