<!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>[5900] sites/trunk/wordcamp.org/public_html/wp-content/themes: WordCamp Base: Remove unused and insecure code.</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/5900">5900</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/5900","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-08 19:02:15 +0000 (Fri, 08 Sep 2017)</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 Base: Remove unused and insecure code.

Some of this was never used (like theme options in Base v2), and some was deprecated but left in place for some reason. It's cluttering the codebase and contains dangerous uses of `unserialize()`, so let's get rid of it.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibclasswcbmanagerphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/class-wcb-manager.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2functionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/functions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libclasswcbmanagerphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/class-wcb-manager.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilsheaderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/header.php</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsessionsclasswcbsessiontemplatephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-session-template.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsessionsclasswcbsessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibspeakersclasswcbspeakertemplatephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speaker-template.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibspeakersclasswcbspeakersphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speakers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsororderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-order.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsortemplatephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-template.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbwidgetsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-widget-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorscssordercss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/css/order.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorscssorderdevcss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/css/order.dev.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsjsorderdevjs">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/js/order.dev.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsjsorderjs">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/js/order.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatesessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatespeakersphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-speakers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatesponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2incthemeoptionsthemeoptionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/theme-options/theme-options.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2inctweaksphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/tweaks.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2incwpcomphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/wpcom.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbarrayoptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-array-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbbuttonoptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-button-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbgridoptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-grid-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcboptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcboptionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-options.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbradiooptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-radio-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbtypekitoptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-typekit-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionscssoptionsgridcss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options-grid.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionscssoptionsgriddevcss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options-grid.dev.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionscssoptionscss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionscssoptionsdevcss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options.dev.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsjsoptionsdevjs">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/js/options.dev.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsjsoptionsjs">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/js/options.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsessionsclasswcbsessiontemplatephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-session-template.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsessionsclasswcbsessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libspeakersclasswcbspeakertemplatephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speaker-template.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libspeakersclasswcbspeakersphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speakers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsororderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-order.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsortemplatephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-template.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbwidgetsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-widget-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorscssordercss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/css/order.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorscssorderdevcss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/css/order.dev.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsjsorderdevjs">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/js/order.dev.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsjsorderjs">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/js/order.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbbodyphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-body.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbcontainerphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-container.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbcontentphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-content.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbelementphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-element.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbelementsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-elements.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbfooterphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-footer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbheaderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-header.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbmenuphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-menu.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbsidebarrowphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-sidebar-row.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbsidebarphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-sidebar.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbstructurephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatesessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatespeakersphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-speakers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatesponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sponsors.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibclasswcbmanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/class-wcb-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/class-wcb-manager.php    2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/class-wcb-manager.php      2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,18 +11,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">        function includes() {
</span><span class="cx" style="display: block; padding: 0 10px">                require_once WCB_LIB_DIR . '/options/class-wcb-options.php';
</span><span class="cx" style="display: block; padding: 0 10px">                require_once WCB_LIB_DIR . '/structure/class-wcb-structure.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                require_once WCB_LIB_DIR . '/speakers/class-wcb-speakers.php';
-               require_once WCB_LIB_DIR . '/sessions/class-wcb-sessions.php';
-               require_once WCB_LIB_DIR . '/sponsors/class-wcb-sponsors.php';
</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">        function loaded() {
</span><span class="cx" style="display: block; padding: 0 10px">                $this->components = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'options'   => new WCB_Options(),
</span><span class="cx" style="display: block; padding: 0 10px">                        'structure' => new WCB_Structure(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'speakers'  => ( apply_filters( 'wcb_load_component_speakers', true ) ) ? new WCB_Speakers() : false,
-                       'sessions'  => ( apply_filters( 'wcb_load_component_sessions', true ) ) ? new WCB_Sessions() : false,
-                       'sponsors'  => ( apply_filters( 'wcb_load_component_sponsors', true ) ) ? new WCB_Sponsors() : false,
</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"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsessionsclasswcbsessiontemplatephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-session-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-session-template.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-session-template.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,119 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * wcb_session_query()
- *
- * Creates and fetches the session query.
- *
- * @return WP_Query The session query.
- */
-function wcb_session_query( $args = '' ) {
-       global $wcb_session_query;
-
-       if ( isset( $wcb_session_query ) )
-               return $wcb_session_query;
-
-       $defaults = array(
-               'post_type'         => WCB_SESSION_POST_TYPE,
-               'orderby'           => 'title',
-               'order'             => 'DESC',
-               'posts_per_page'    => -1,
-       );
-       $args = wp_parse_args( $args, $defaults );
-
-       $wcb_session_query = new WP_Query( $args );
-
-       return $wcb_session_query;
-}
-
-/**
- * wcb_have_sessions()
- *
- * Whether there are more sessions available in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_have_sessions() {
-       $query = wcb_session_query();
-       return $query->have_posts();
-}
-
-/**
- * wcb_rewind_sessions()
- *
- * Rewind the sessions loop.
- */
-function wcb_rewind_sessions() {
-       $query = wcb_session_query();
-       return $query->rewind_posts();
-}
-
-/**
- * wcb_the_session()
- *
- * Loads up the current session in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_the_session() {
-       $query = wcb_session_query();
-       return $query->the_post();
-}
-
-/**
- * wcb_get_session_speakers()
- *
- * Gets the speakers for the current session.
- *
- * @return object WordCamp information
- */
-function wcb_get_session_speakers() {
-       $sessions = wcb_get('sessions');
-       return esc_html( $sessions->meta_manager->get( get_the_ID(), 'speakers' ) );
-}
-
-
-/**
- * wcb_get_session_track()
- *
- * Gets the track for the current session.
- *
- * @return object WordCamp information
- */
-function wcb_get_session_track() {
-       $track = get_the_terms( get_the_ID(), WCB_TRACK_TAXONOMY );
-
-       if ( empty( $track ) )
-               return '';
-
-       $track = array_values( $track );
-       return $track[0]->name;
-}
-
-
-function wcb_session_entry_meta( $meta ) {
-       if ( get_post_type() == WCB_SESSION_POST_TYPE ) {
-               $track  = wcb_get_session_track();
-
-               $meta['speakers']   = sprintf( __('Presented by %s', 'wordcamporg'), wcb_get_session_speakers() );
-
-               if ( empty( $track ) ) {
-                       $meta['order']  = array('speakers', 'edit');
-
-               } else {
-                       $meta['track'] = sprintf( __('%s Track', 'wordcamporg'), $track );
-
-                       $link = get_term_link( $track, WCB_TRACK_TAXONOMY );
-                       if ( ! is_wp_error( $link ) ) {
-                               $meta['track'] = "<a href='$link'>{$meta['track']}</a>";
-                       }
-
-                       $meta['order']  = array('speakers', 'sep', 'track', 'edit');
-               }
-       }
-
-       return $meta;
-}
-add_filter( 'wcb_entry_meta', 'wcb_session_entry_meta' );
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsessionsclasswcbsessionsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-sessions.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-sessions.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,135 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Sessions extends WCB_Loader {
-       var $meta_manager;
-
-       function constants() {
-               wcb_maybe_define( 'WCB_SESSION_POST_TYPE', 'wcb_session', 'wcb_session_post_type' );
-               wcb_maybe_define( 'WCB_SESSION_SLUG',      'session',     'wcb_session_slug'      );
-               wcb_maybe_define( 'WCB_TRACK_TAXONOMY',    'wcb_track',   'wcb_track_taxonomy'    );
-       }
-
-       function includes() {
-               require_once "class-wcb-session-template.php";
-       }
-
-       function loaded() {
-               $this->meta_manager = new WCB_Post_Meta_Manager( array(
-                       'prefix'    => 'wcb_session',
-                       'keys'      => array('speakers'),
-               ) );
-
-               if ( is_admin() ) {
-                       $meta_fields = array(
-                               'speakers'  => array(
-                                       'type'      => 'text',
-                                       'label'     => __('Speakers', 'wordcamporg'),
-                               )
-                       );
-
-                       $box = wcb_get_metabox( 'WCB_Post_Metabox' );
-                       $box->add_instance( WCB_SESSION_POST_TYPE, array(
-                               'title'          => __('Speakers', 'wordcamporg'),
-                               'meta_manager'   => $this->meta_manager,
-                               'meta_fields'    => $meta_fields,
-                               'context'        => 'normal',
-                               'priority'       => 'high',
-                       ) );
-               }
-       }
-
-       function register_post_types() {
-               // Session post type labels
-               $labels = array (
-                       'name'                  => __( 'Sessions', 'wordcamporg' ),
-                       'singular_name'         => __( 'Session', 'wordcamporg' ),
-                       'add_new'               => __( 'Add New', 'wordcamporg' ),
-                       'add_new_item'          => __( 'Create New Session', 'wordcamporg' ),
-                       'edit'                  => __( 'Edit', 'wordcamporg' ),
-                       'edit_item'             => __( 'Edit Session', 'wordcamporg' ),
-                       'new_item'              => __( 'New Session', 'wordcamporg' ),
-                       'view'                  => __( 'View Session', 'wordcamporg' ),
-                       'view_item'             => __( 'View Session', 'wordcamporg' ),
-                       'search_items'          => __( 'Search Sessions', 'wordcamporg' ),
-                       'not_found'             => __( 'No sessions found', 'wordcamporg' ),
-                       'not_found_in_trash'    => __( 'No sessions found in Trash', 'wordcamporg' ),
-                       'parent_item_colon'     => __( 'Parent Session:', 'wordcamporg' )
-               );
-
-               // Session post type rewrite
-               $rewrite = array (
-                       'slug'        => WCB_SESSION_SLUG,
-                       'with_front'  => false,
-               );
-
-               // Session post type supports
-               $supports = array (
-                       'title',
-                       'editor',
-                       'revisions',
-                       'thumbnail',
-               );
-
-               $menu_icon = wcb_menu_icon( WCB_SESSION_POST_TYPE, WCB_URL . '/images/sessions.png' );
-
-               // Register session post type
-               register_post_type (
-                       WCB_SESSION_POST_TYPE,
-                       apply_filters( 'wcb_session_register_post_type',
-                               array (
-                                       'labels'            => $labels,
-                                       'rewrite'           => $rewrite,
-                                       'supports'          => $supports,
-                                       'menu_position'     => 21,
-                                       'public'            => true,
-                                       'show_ui'           => true,
-                                       'can_export'        => true,
-                                       'capability_type'   => 'post',
-                                       'hierarchical'      => false,
-                                       'query_var'         => true,
-                                       'menu_icon'         => $menu_icon,
-                               )
-                       )
-               );
-       }
-
-       function register_taxonomies() {
-
-               // Labels
-               $labels = array (
-                       'name'              => __( 'Tracks', 'wordcamporg'),
-                       'singular_name'     => __( 'Track', 'wordcamporg'),
-                       'search_items'      => __( 'Search Tracks', 'wordcamporg'),
-                       'popular_items'     => __( 'Popular Tracks','wordcampbase'),
-                       'all_items'         => __( 'All Tracks', 'wordcamporg'),
-                       'edit_item'         => __( 'Edit Track', 'wordcamporg'),
-                       'update_item'       => __( 'Update Track', 'wordcamporg'),
-                       'add_new_item'      => __( 'Add Track', 'wordcamporg'),
-                       'new_item_name'     => __( 'New Track', 'wordcamporg'),
-               );
-
-               // Rewrite
-               $rewrite = array (
-                       'slug' => 'track'
-               );
-
-               // Register the taxonomy
-               register_taxonomy (
-                       WCB_TRACK_TAXONOMY,             // The tax ID
-                       WCB_SESSION_POST_TYPE,          // The post type ID
-                       apply_filters( 'wcb_track_taxonomy_register',
-                               array (
-                                       'labels'                => $labels,
-                                       'rewrite'               => $rewrite,
-                                       'query_var'             => 'track',
-                                       'hierarchical'          => true,
-                                       'public'                => true,
-                                       'show_ui'               => true,
-                               )
-                       )
-               );
-       }
-
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibspeakersclasswcbspeakertemplatephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speaker-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speaker-template.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speaker-template.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,109 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * wcb_speaker_query()
- *
- * Creates and fetches the speaker query.
- *
- * @return WP_Query The speaker query.
- */
-function wcb_speaker_query( $args = '' ) {
-       global $wcb_speaker_query;
-
-       if ( isset( $wcb_speaker_query ) )
-               return $wcb_speaker_query;
-
-
-       $defaults = array(
-               'post_type'         => WCB_SPEAKER_POST_TYPE,
-               'orderby'           => 'title',
-               'order'             => 'DESC',
-               'posts_per_page'    => -1,
-       );
-       $args = wp_parse_args( $args, $defaults );
-
-       $wcb_speaker_query = new WP_Query( $args );
-
-       // Sort posts by last name
-       // (by last word in the title, really)
-       $sorter = array();
-       foreach ( $wcb_speaker_query->posts as $speaker ) {
-               // Place the "last name" first.
-               $name_parts     = explode( " ", trim( $speaker->post_title ) );
-               $inverted_name  = array_pop( $name_parts ) . " " . implode( " ", $name_parts );
-
-               // Ensure our name is unique.
-               $sorted_name    = $inverted_name;
-               $index          = 0;
-               while ( isset( $sorter[ $sorted_name ] ) ) {
-                       $index++;
-                       $sorted_name = $inverted_name . $index;
-               }
-
-               $sorter[ $sorted_name ] = $speaker;
-       }
-       ksort( $sorter );
-       $wcb_speaker_query->posts = array_values( $sorter );
-
-       return $wcb_speaker_query;
-}
-
-/**
- * wcb_have_speakers()
- *
- * Whether there are more speakers available in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_have_speakers() {
-       $query = wcb_speaker_query();
-       return $query->have_posts();
-}
-
-/**
- * wcb_rewind_speakers()
- *
- * Rewind the speakers loop.
- */
-function wcb_rewind_speakers() {
-       $query = wcb_speaker_query();
-       return $query->rewind_posts();
-}
-
-/**
- * wcb_the_speaker()
- *
- * Loads up the current speaker in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_the_speaker() {
-       $query = wcb_speaker_query();
-       return $query->the_post();
-}
-
-/**
- * wcb_get_speaker_gravatar()
- *
- * Gets the gravatar of the current speaker.
- *
- * @return object WordCamp information
- */
-function wcb_get_speaker_gravatar( $size=96 ) {
-       $speakers = wcb_get('speakers');
-       return get_avatar( $speakers->meta_manager->get( get_the_ID(), 'email' ), $size );
-}
-
-/**
- * wcb_get_speaker_slug()
- *
- * Gets the slug for the current speaker.
- *
- * @return object WordCamp information
- */
-function wcb_get_speaker_slug() {
-       global $post;
-       return $post->post_name;
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibspeakersclasswcbspeakersphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speakers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speakers.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speakers.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,94 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Speakers extends WCB_Loader {
-       var $meta_manager;
-
-       function constants() {
-               wcb_maybe_define( 'WCB_SPEAKER_POST_TYPE', 'wcb_speaker', 'wcb_speaker_post_type' );
-               wcb_maybe_define( 'WCB_SPEAKER_SLUG',      'speaker',     'wcb_speaker_slug'      );
-       }
-
-       function includes() {
-               require_once "class-wcb-speaker-template.php";
-       }
-
-       function loaded() {
-               $this->meta_manager = new WCB_Post_Meta_Manager( array(
-                       'prefix'    => 'wcb_speaker',
-                       'keys'      => array('email'),
-               ) );
-
-               if ( is_admin() ) {
-                       $meta_fields = array(
-                               'email'     => array(
-                                       'type'      => 'text',
-                                       'label'     => __('Gravatar Email', 'wordcamporg'),
-                               )
-                       );
-
-                       $box = wcb_get_metabox( 'WCB_Post_Metabox' );
-                       $box->add_instance( WCB_SPEAKER_POST_TYPE, array(
-                               'title'          => __('Gravatar Email', 'wordcamporg'),
-                               'meta_manager'   => $this->meta_manager,
-                               'meta_fields'    => $meta_fields,
-                       ) );
-               }
-       }
-
-       function register_post_types() {
-               // Speaker post type labels
-               $labels = array (
-                       'name'                  => __( 'Speakers', 'wordcamporg' ),
-                       'singular_name'         => __( 'Speaker', 'wordcamporg' ),
-                       'add_new'               => __( 'Add New', 'wordcamporg' ),
-                       'add_new_item'          => __( 'Create New Speaker', 'wordcamporg' ),
-                       'edit'                  => __( 'Edit', 'wordcamporg' ),
-                       'edit_item'             => __( 'Edit Speaker', 'wordcamporg' ),
-                       'new_item'              => __( 'New Speaker', 'wordcamporg' ),
-                       'view'                  => __( 'View Speaker', 'wordcamporg' ),
-                       'view_item'             => __( 'View Speaker', 'wordcamporg' ),
-                       'search_items'          => __( 'Search Speakers', 'wordcamporg' ),
-                       'not_found'             => __( 'No speakers found', 'wordcamporg' ),
-                       'not_found_in_trash'    => __( 'No speakers found in Trash', 'wordcamporg' ),
-                       'parent_item_colon'     => __( 'Parent Speaker:', 'wordcamporg' )
-               );
-
-               // Speaker post type rewrite
-               $rewrite = array (
-                       'slug'        => WCB_SPEAKER_SLUG,
-                       'with_front'  => false,
-               );
-
-               // Speaker post type supports
-               $supports = array (
-                       'title',
-                       'editor',
-                       'revisions',
-               );
-
-               $menu_icon = wcb_menu_icon( WCB_SPEAKER_POST_TYPE, WCB_URL . '/images/speakers.png' );
-
-               // Register speaker post type
-               register_post_type (
-                       WCB_SPEAKER_POST_TYPE,
-                       apply_filters( 'wcb_speaker_register_post_type',
-                               array (
-                                       'labels'            => $labels,
-                                       'rewrite'           => $rewrite,
-                                       'supports'          => $supports,
-                                       'menu_position'     => 20,
-                                       'public'            => false,
-                                       'show_ui'           => true,
-                                       'can_export'        => true,
-                                       'capability_type'   => 'post',
-                                       'hierarchical'      => false,
-                                       'query_var'         => true,
-                                       'menu_icon'         => $menu_icon,
-                               )
-                       )
-               );
-       }
-
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsororderphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-order.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-order.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-order.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,117 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Sponsor_Order extends WCB_Loader {
-
-       function hooks() {
-               add_action('admin_init',     array( &$this, 'admin_init' )        );
-               add_action('admin_menu',     array( &$this, 'admin_menu' )        );
-
-               add_filter('wcb_get_option', array( &$this, 'get_option' ), 10, 2 );
-       }
-
-       function admin_menu() {
-               $page = add_submenu_page(
-                       'edit.php?post_type=' . WCB_SPONSOR_POST_TYPE,  // Page type
-                       __('Order Sponsor Levels', 'wordcamporg'),              // Page title
-                       __('Order Sponsor Levels', 'wordcamporg'),              // Menu title
-                       'edit_posts',                                   // Capability
-                       'sponsor_levels',                               // Menu slug
-                       array( &$this, 'render' )                       // Callback
-               );
-
-               add_action("wcb_enqueue_scripts_$page", array( &$this, 'enqueue_scripts' ) );
-       }
-
-       function enqueue_scripts() {
-               wp_enqueue_script( 'wcb-sponsor-order', wcb_dev_url( WCB_LIB_URL . '/sponsors/js/order.js' ), array('jquery-ui-sortable'), '20110212' );
-               wp_enqueue_style( 'wcb-sponsor-order', wcb_dev_url( WCB_LIB_URL . '/sponsors/css/order.css' ), array(), '20110212' );
-       }
-
-       function admin_init() {
-               register_setting( 'wcb_sponsor_options', $this->get_name(), array( &$this, 'validate' ) );
-       }
-
-       function validate( $input ) {
-               if ( ! is_array( $input ) ) {
-                       $input = null;
-               } else {
-                       foreach ( $input as $key => $value ) {
-                               $input[ $key ] = (int) $input[ $key ];
-                       }
-                       $input = array_values( $input );
-               }
-
-               return $input;
-       }
-
-       function get_name() {
-               return 'wcb_sponsor_level_order';
-       }
-
-       function render() {
-               if ( ! isset( $_REQUEST['updated'] ) )
-                       $_REQUEST['updated'] = false;
-
-               $levels = $this->get_levels();
-               ?>
-               <div class="wrap">
-                       <?php screen_icon(); ?>
-                       <h1><?php _e( 'Order Sponsor Levels', 'wordcamporg' ); ?></h1>
-
-                       <?php if ( false !== $_REQUEST['updated'] ) : ?>
-                               <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcamporg' ); ?></strong></p></div>
-                       <?php endif; ?>
-
-                       <form method="post" action="options.php">
-                               <?php settings_fields( 'wcb_sponsor_options' ); ?>
-                               <div class="description sponsor-order-instructions">
-                                       <?php _e('Change the order of sponsor levels are displayed in the sponsors page template.', 'wordcamporg'); ?>
-                               </div>
-                               <ul class="sponsor-order">
-                               <?php foreach( $levels as $term ): ?>
-                                       <li class="level">
-                                               <input type="hidden" class="level-id" name="<?php echo esc_attr( $this->get_name() ); ?>[]" value="<?php echo esc_attr( $term->term_id ); ?>" />
-                                               <?php echo esc_html( $term->name ); ?>
-                                       </li>
-                               <?php endforeach; ?>
-                               </ul>
-                               <p class="submit">
-                                       <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcamporg' ); ?>" />
-                               </p>
-                       </form>
-               </div>
-               <?php
-       }
-
-       function get_levels() {
-               $option         = get_option( $this->get_name() );
-               $term_objects   = get_terms( WCB_SPONSOR_LEVEL_TAXONOMY, array('get' => 'all') );
-               $terms          = array();
-               $ordered_terms  = array();
-
-               foreach ( $term_objects as $term ) {
-                       $terms[ $term->term_id ] = $term;
-               }
-
-               if ( empty( $option ) )
-                       $option = array();
-
-               foreach ( $option as $term_id ) {
-                       if ( isset( $terms[ $term_id ] ) ) {
-                               $ordered_terms[] = $terms[ $term_id ];
-                               unset( $terms[ $term_id ] );
-                       }
-               }
-
-               return array_merge( $ordered_terms, array_values( $terms ) );
-       }
-
-       function get_option( $option, $name ) {
-               if ( 'sponsor_level_order' == $name )
-                       return $this->get_levels();
-               else
-                       return $option;
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsortemplatephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-template.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-template.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,81 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * wcb_sponsor_query()
- *
- * Creates and fetches the sponsor query.
- *
- * @return WP_Query The sponsor query.
- */
-function wcb_sponsor_query( $args=array() ) {
-       global $wcb_sponsor_query;
-
-       if ( empty( $args ) && isset( $wcb_sponsor_query ) )
-               return $wcb_sponsor_query;
-
-       $defaults = array(
-               'post_type'         => WCB_SPONSOR_POST_TYPE,
-               'order'             => 'ASC',
-               'posts_per_page'    => -1,
-       );
-       $args = wp_parse_args( $args, $defaults );
-
-       $wcb_sponsor_query = new WP_Query( $args );
-
-       return $wcb_sponsor_query;
-}
-
-/**
- * wcb_have_sponsors()
- *
- * Whether there are more sponsors available in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_have_sponsors() {
-       $query = wcb_sponsor_query();
-       return $query->have_posts();
-}
-
-/**
- * wcb_rewind_sponsors()
- *
- * Rewind the sponsors loop.
- */
-function wcb_rewind_sponsors() {
-       $query = wcb_sponsor_query();
-       return $query->rewind_posts();
-}
-
-/**
- * wcb_the_sponsor()
- *
- * Loads up the current sponsor in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_the_sponsor() {
-       $query = wcb_sponsor_query();
-       return $query->the_post();
-}
-
-/**
- * wcb_sponsor_level_class()
- *
- * Prints the sponsor level class attribute.
- */
-function wcb_sponsor_level_class( $term, $classes='' ) {
-       echo ' class="' . esc_attr( wcb_get_sponsor_level_class( $term, $classes ) ) . '" ';
-}
-       /**
-        * wcb_get_sponsor_level_class()
-        *
-        * Returns the sponsor level classes.
-        *
-        * @return string Sponsor level classes.
-        */
-       function wcb_get_sponsor_level_class( $term, $classes='' ) {
-               return "sponsor-level $term->slug $classes";
-       }
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsorsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsors.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsors.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,117 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Sponsors extends WCB_Loader {
-       var $meta_manager;
-
-       function constants() {
-               wcb_maybe_define( 'WCB_SPONSOR_POST_TYPE',      'wcb_sponsor',       'wcb_sponsor_post_type'      );
-               wcb_maybe_define( 'WCB_SPONSOR_SLUG',           'sponsor',           'wcb_sponsor_slug'           );
-               wcb_maybe_define( 'WCB_SPONSOR_LEVEL_TAXONOMY', 'wcb_sponsor_level', 'wcb_sponsor_level_taxonomy' );
-               wcb_maybe_define( 'WCB_SPONSOR_LEVEL_SLUG',     'sponsor_level',     'wcb_sponsor_level_slug'     );
-       }
-
-       function includes() {
-               require_once "class-wcb-sponsor-template.php";
-               require_once "class-wcb-sponsor-order.php";
-               require_once "class-wcb-widget-sponsors.php";
-       }
-
-       function loaded() {
-               new WCB_Sponsor_Order;
-               register_widget('WCB_Widget_Sponsors');
-       }
-
-       function register_post_types() {
-               // Sponsor post type labels
-               $labels = array (
-                       'name'                  => __( 'Sponsors', 'wordcamporg' ),
-                       'singular_name'         => __( 'Sponsor', 'wordcamporg' ),
-                       'add_new'               => __( 'Add New', 'wordcamporg' ),
-                       'add_new_item'          => __( 'Create New Sponsor', 'wordcamporg' ),
-                       'edit'                  => __( 'Edit', 'wordcamporg' ),
-                       'edit_item'             => __( 'Edit Sponsor', 'wordcamporg' ),
-                       'new_item'              => __( 'New Sponsor', 'wordcamporg' ),
-                       'view'                  => __( 'View Sponsor', 'wordcamporg' ),
-                       'view_item'             => __( 'View Sponsor', 'wordcamporg' ),
-                       'search_items'          => __( 'Search Sponsors', 'wordcamporg' ),
-                       'not_found'             => __( 'No sponsors found', 'wordcamporg' ),
-                       'not_found_in_trash'    => __( 'No sponsors found in Trash', 'wordcamporg' ),
-                       'parent_item_colon'     => __( 'Parent Sponsor:', 'wordcamporg' )
-               );
-
-               // Sponsor post type rewrite
-               $rewrite = array (
-                       'slug'        => WCB_SPONSOR_SLUG,
-                       'with_front'  => false,
-               );
-
-               // Sponsor post type supports
-               $supports = array (
-                       'title',
-                       'editor',
-                       'revisions',
-                       'thumbnail',
-               );
-
-               $menu_icon = wcb_menu_icon( WCB_SPONSOR_POST_TYPE, WCB_URL . '/images/sponsors.png' );
-
-               // Register sponsor post type
-               register_post_type (
-                       WCB_SPONSOR_POST_TYPE,
-                       apply_filters( 'wcb_sponsor_register_post_type',
-                               array (
-                                       'labels'            => $labels,
-                                       'rewrite'           => $rewrite,
-                                       'supports'          => $supports,
-                                       'menu_position'     => 21,
-                                       'public'            => true,
-                                       'show_ui'           => true,
-                                       'can_export'        => true,
-                                       'capability_type'   => 'post',
-                                       'hierarchical'      => false,
-                                       'query_var'         => true,
-                                       'menu_icon'         => $menu_icon,
-                               )
-                       )
-               );
-       }
-
-       function register_taxonomies() {
-
-               // Labels
-               $labels = array (
-                       'name'              => __( 'Sponsor Levels', 'wordcamporg'),
-                       'singular_name'     => __( 'Sponsor Level', 'wordcamporg'),
-                       'search_items'      => __( 'Search Sponsor Levels', 'wordcamporg'),
-                       'popular_items'     => __( 'Popular Sponsor Levels', 'wordcamporg'),
-                       'all_items'         => __( 'All Sponsor Levels', 'wordcamporg'),
-                       'edit_item'         => __( 'Edit Sponsor Level', 'wordcamporg'),
-                       'update_item'       => __( 'Update Sponsor Level','wordcampbase'),
-                       'add_new_item'      => __( 'Add Sponsor Level', 'wordcamporg'),
-                       'new_item_name'     => __( 'New Sponsor Level', 'wordcamporg'),
-               );
-
-               // Rewrite
-               $rewrite = array (
-                       'slug' => WCB_SPONSOR_LEVEL_SLUG
-               );
-
-               // Register the taxonomy
-               register_taxonomy (
-                       WCB_SPONSOR_LEVEL_TAXONOMY,     // The tax ID
-                       WCB_SPONSOR_POST_TYPE,          // The post type ID
-                       apply_filters( 'wcb_sponsor_level_tax_register',
-                               array (
-                                       'labels'                => $labels,
-                                       'rewrite'               => $rewrite,
-                                       'query_var'             => 'sponsor_level',
-                                       'hierarchical'          => true,
-                                       'public'                => true,
-                                       'show_ui'               => true,
-                               )
-                       )
-               );
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbwidgetsponsorsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-widget-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-widget-sponsors.php   2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-widget-sponsors.php     2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,71 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-if ( ! class_exists( 'WCB_Widget_Sponsors' ) ) :
-class WCB_Widget_Sponsors extends WP_Widget {
-
-       function __construct() {
-               $widget_ops = array(
-                       'classname' => 'wcb_widget_sponsors',
-                       'description' => __( 'Your WordCamp&#8217;s Sponsors', 'wordcamporg' ),
-               );
-               WP_Widget::__construct( 'wcb_sponsors', __('Sponsors', 'wordcamporg'), $widget_ops );
-       }
-
-       function widget( $args, $instance ) {
-               extract( $args );
-               $title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-
-               echo $before_widget;
-               if ( $title )
-                       echo $before_title . $title . $after_title;
-
-               // Fetch sponsors
-               $terms = wcb_get_option('sponsor_level_order');
-
-               foreach ( $terms as $term ):
-                       $sponsors = wcb_sponsor_query( array(
-                               'taxonomy' => $term->taxonomy,
-                               'term'     => $term->slug,
-                       ) );
-
-                       if ( ! wcb_have_sponsors() )
-                               continue;
-
-                       // Open sponsor level ?>
-                       <div <?php wcb_sponsor_level_class( $term ); ?>>
-                       <h4 class="sponsor-level-title"><?php echo esc_html( $term->name ); ?></h4><?php
-
-                       while ( wcb_have_sponsors() ):
-                               wcb_the_sponsor();
-                               ?><a class="sponsor-logo" href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
-                                       if ( has_post_thumbnail() )
-                                               the_post_thumbnail();
-                                       else
-                                               the_title();
-                               ?></a><?php
-                       endwhile;
-
-                       // Close sponsor level. ?>
-                       </div><?php
-               endforeach;
-
-               echo $after_widget;
-       }
-
-       function form( $instance ) {
-               $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-               $title = $instance['title'];
-?>
-               <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'wordcamporg'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
-<?php
-       }
-
-       function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
-               $instance['title'] = strip_tags($new_instance['title']);
-               return $instance;
-       }
-
-}
-endif; // class_exists
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorscssordercss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/css/order.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/css/order.css   2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/css/order.css     2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.sponsor-order-instructions{font-style:italic;margin:20px 0 0 20px;}.sponsor-order{margin:20px 20px 40px;width:300px;}.sponsor-order .level{padding:10px;cursor:move;font-weight:bold;text-shadow:0 1px 1px #fff;background-color:#eee;background-image:-moz-linear-gradient(top,rgba(255,255,255,0.2),rgba(0,0,0,0.1));background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(255,255,255,0.2)),to(rgba(0,0,0,0.1)));border:1px solid #ccc;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorscssorderdevcss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/css/order.dev.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/css/order.dev.css       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/css/order.dev.css 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,25 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.sponsor-order-instructions {
-       font-style: italic;
-       margin: 20px 0 0 20px;
-}
-.sponsor-order {
-       margin: 20px 20px 40px;
-       width: 300px;
-}
-
-.sponsor-order .level {
-       padding: 10px;
-       cursor: move;
-
-       font-weight: bold;
-       text-shadow: 0 1px 1px #fff;
-
-       background-color: #eee;
-       background-image: -moz-linear-gradient(top,  rgba(255,255,255,0.2),  rgba(0,0,0,0.1));
-       background-image: -webkit-gradient(linear, left top, left bottom, from( rgba(255,255,255,0.2) ), to( rgba(0,0,0,0.1) ));
-
-       border: 1px solid #ccc;
-       -webkit-border-radius:4px;
-       -moz-border-radius: 4px;
-       border-radius:4px;
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsjsorderdevjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/js/order.dev.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/js/order.dev.js 2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/js/order.dev.js   2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-jQuery( function($){
-       $('.sponsor-order').sortable();
-});
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsjsorderjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/js/order.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/js/order.js     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/js/order.js       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-jQuery(function(a){a(".sponsor-order").sortable()});
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatesessionsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sessions.php        2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sessions.php  2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,62 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * @deprecated (template name was Sessions)
- *
- * A custom page template that provides a list of sessions.
- */
-
-$structure = wcb_get('structure');
-$structure->full_width_content();
-
-$sessions = wcb_session_query();
-
-wcb_suppress_sharing();
-
-get_header(); ?>
-
-               <div id="container">
-                       <div id="content" role="main">
-                               <div class="callout lead"><?php
-                               if ( have_posts() ):
-                                       the_post();
-                                       the_content();
-                               endif; ?>
-                               </div>
-
-                               <div class="cpt-loop sessions"><?php
-
-                               $half_id = wcb_optimal_column_split( $sessions, 200 );
-                               // Open the first column
-                               echo '<div class="grid_6 alpha">';
-
-                               while ( wcb_have_sessions() ):
-                                       wcb_the_session();
-
-                                       // Close the first column, open the second.
-                                       if ( get_the_ID() == $half_id )
-                                               echo '</div><div class="grid_6 omega">';
-
-                                       ?>
-                                       <div id="post-<?php the_ID(); ?>" <?php post_class( 'session' ); ?>>
-                                               <h3 class="entry-title session-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
-                                               <div class="entry-meta session-speakers">
-                                                       <?php wcb_entry_meta(); ?>
-                                               </div>
-                                               <div class="entry-content session-description"><?php
-                                                       if ( has_post_thumbnail() )
-                                                               the_post_thumbnail();
-                                                       the_content(); ?>
-                                               </div>
-                                       </div>
-                                       <?php
-                               endwhile;
-
-                               // Close the second column
-                               echo '</div>'; ?>
-                               </div>
-                               <?php wcb_print_sharing(); ?>
-                       </div><!-- #content -->
-               </div><!-- #container -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatespeakersphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-speakers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-speakers.php        2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-speakers.php  2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,73 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * @deprecated (template name was speakers)
- *
- * A custom page template that provides a list of speakers.
- */
-
-$structure = wcb_get('structure');
-$structure->full_width_content();
-
-$speakers = wcb_speaker_query();
-
-wcb_suppress_sharing();
-
-get_header(); ?>
-
-               <div id="container">
-                       <div id="content" role="main">
-                               <div class="callout lead"><?php
-                               if ( have_posts() ):
-                                       the_post();
-                                       the_content();
-                               endif; ?>
-                               </div>
-
-                               <div class="cpt-loop speaker-gravatar-list clearfix"><?php
-                                       while ( wcb_have_speakers() ):
-                                               wcb_the_speaker();
-
-                                               $href  = '#' . esc_attr( wcb_get_speaker_slug() );
-                                               $title = esc_attr( get_the_title() );
-                                               echo "<a href='$href' title='$title'>";
-                                               echo wcb_get_speaker_gravatar( 48 );
-                                               echo '</a>';
-                                       endwhile;
-                                       wcb_rewind_speakers();
-                               ?></div>
-
-                               <div class="cpt-loop speakers"><?php
-
-                               $half_id = wcb_optimal_column_split( $speakers, 200, 200 );
-                               // Open the first column
-                               echo '<div class="grid_6 alpha">';
-
-                               while ( wcb_have_speakers() ):
-                                       wcb_the_speaker();
-
-                                       // Close the first column, open the second.
-                                       if ( get_the_ID() == $half_id )
-                                               echo '</div><div class="grid_6 omega">';
-
-                                       ?>
-                                       <div id="<?php echo esc_attr( wcb_get_speaker_slug() ); ?>" <?php post_class( 'speaker clearfix' ); ?>>
-                                               <h3 class="entry-title speaker-name"><?php the_title(); ?></h3>
-                                               <div class="entry-content speaker-bio"><?php
-                                                       echo wcb_get_speaker_gravatar( 102 );
-                                                       the_content(); ?>
-                                               </div>
-                                       </div>
-                                       <?php
-                               endwhile;
-
-                               // Close the second column
-                               echo '</div>';
-
-                               wcb_print_sharing();
-                               ?>
-                               </div>
-                       </div><!-- #content -->
-               </div><!-- #container -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatesponsorsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sponsors.php        2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sponsors.php  2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,67 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * @deprecated (template name was Sponsors)
- *
- * A custom page template that provides a list of sponsors.
- */
-
-wcb_suppress_sharing();
-
-get_header(); ?>
-
-               <div id="container">
-                       <div id="content" role="main">
-                               <div class="sponsor-intro"><?php
-                               if ( have_posts() ):
-                                       the_post(); ?>
-                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                               <h1 class="entry-title"><?php the_title(); ?></h1>
-                                               <div class="entry-content"><?php the_content(); ?></div>
-                                       </div>
-                               <?php endif; ?>
-                               </div>
-
-                               <div class="sponsors"><?php
-
-                               $terms = wcb_get_option('sponsor_level_order');
-
-                               foreach ( $terms as $term ):
-                                       $sponsors = wcb_sponsor_query( array(
-                                               'taxonomy' => $term->taxonomy,
-                                               'term'     => $term->slug,
-                                       ) );
-
-                                       if ( ! wcb_have_sponsors() )
-                                               continue;
-
-                                       // Open sponsor level ?>
-                                       <div <?php wcb_sponsor_level_class( $term ); ?>>
-                                       <h2 class="sponsor-level-title"><?php echo esc_html( $term->name ); ?></h2><?php
-
-                                       while ( wcb_have_sponsors() ):
-                                               wcb_the_sponsor();
-                                               ?>
-                                               <div id="post-<?php the_ID(); ?>" <?php post_class( 'sponsor' ); ?>>
-                                                       <h3 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
-                                                               if ( has_post_thumbnail() )
-                                                                       the_post_thumbnail();
-                                                               else
-                                                                       the_title();
-                                                       ?></a></h3>
-                                                       <div class="entry-content sponsor-description"><?php
-                                                               the_content(); ?>
-                                                       </div>
-                                               </div>
-                                               <?php
-                                       endwhile;
-
-                                       // Close sponsor level. ?>
-                                       </div><?php
-                               endforeach; ?>
-                               </div>
-                               <?php wcb_print_sharing(); ?>
-                       </div><!-- #content -->
-               </div><!-- #container -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2functionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/functions.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/functions.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,21 +43,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        require( get_template_directory() . '/inc/template-tags.php' );
</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">-         * Custom functions that act independently of the theme templates
-        */
-       //require( get_template_directory() . '/inc/tweaks.php' );
-
-       /**
-        * Custom Theme Options
-        */
-       //require( get_template_directory() . '/inc/theme-options/theme-options.php' );
-
-       /**
-        * WordPress.com-specific functions and definitions
-        */
-       //require( get_template_directory() . '/inc/wpcom.php' );
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * Add default posts and comments RSS feed links to head
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        add_theme_support( 'automatic-feed-links' );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2incthemeoptionsthemeoptionsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/theme-options/theme-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/theme-options/theme-options.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/theme-options/theme-options.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,305 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * WCBS Theme Options
- *
- * @package WCBS
- * @since WCBS 1.0
- */
-
-/**
- * Register the form setting for our wcbs_options array.
- *
- * This function is attached to the admin_init action hook.
- *
- * This call to register_setting() registers a validation callback, wcbs_theme_options_validate(),
- * which is used when the option is saved, to ensure that our option values are properly
- * formatted, and safe.
- *
- * @since WCBS 1.0
- */
-function wcbs_theme_options_init() {
-       register_setting(
-               'wcbs_options',       // Options group, see settings_fields() call in wcbs_theme_options_render_page()
-               'wcbs_theme_options', // Database option, see wcbs_get_theme_options()
-               'wcbs_theme_options_validate' // The sanitization callback, see wcbs_theme_options_validate()
-       );
-
-       // Register our settings field group
-       add_settings_section(
-               'general', // Unique identifier for the settings section
-               '', // Section title (we don't want one)
-               '__return_false', // Section callback (we don't want anything)
-               'theme_options' // Menu slug, used to uniquely identify the page; see wcbs_theme_options_add_page()
-       );
-
-       // Register our individual settings fields
-       add_settings_field(
-               'sample_checkbox', // Unique identifier for the field for this section
-               __( 'Sample Checkbox', 'wordcamporg' ), // Setting field label
-               'wcbs_settings_field_sample_checkbox', // Function that renders the settings field
-               'theme_options', // Menu slug, used to uniquely identify the page; see wcbs_theme_options_add_page()
-               'general' // Settings section. Same as the first argument in the add_settings_section() above
-       );
-
-       add_settings_field( 'sample_text_input', __( 'Sample Text Input', 'wordcamporg' ), 'wcbs_settings_field_sample_text_input', 'theme_options', 'general' );
-       add_settings_field( 'sample_select_options', __( 'Sample Select Options', 'wordcamporg' ), 'wcbs_settings_field_sample_select_options', 'theme_options', 'general' );
-       add_settings_field( 'sample_radio_buttons', __( 'Sample Radio Buttons', 'wordcamporg' ), 'wcbs_settings_field_sample_radio_buttons', 'theme_options', 'general' );
-       add_settings_field( 'sample_textarea', __( 'Sample Textarea', 'wordcamporg' ), 'wcbs_settings_field_sample_textarea', 'theme_options', 'general' );
-}
-add_action( 'admin_init', 'wcbs_theme_options_init' );
-
-/**
- * Change the capability required to save the 'wcbs_options' options group.
- *
- * @see wcbs_theme_options_init() First parameter to register_setting() is the name of the options group.
- * @see wcbs_theme_options_add_page() The edit_theme_options capability is used for viewing the page.
- *
- * @param string $capability The capability used for the page, which is manage_options by default.
- * @return string The capability to actually use.
- */
-function wcbs_option_page_capability( $capability ) {
-       return 'edit_theme_options';
-}
-add_filter( 'option_page_capability_wcbs_options', 'wcbs_option_page_capability' );
-
-/**
- * Add our theme options page to the admin menu.
- *
- * This function is attached to the admin_menu action hook.
- *
- * @since WCBS 1.0
- */
-function wcbs_theme_options_add_page() {
-       $theme_page = add_theme_page(
-               __( 'Theme Options', 'wordcamporg' ),   // Name of page
-               __( 'Theme Options', 'wordcamporg' ),   // Label in menu
-               'edit_theme_options',                    // Capability required
-               'theme_options',                         // Menu slug, used to uniquely identify the page
-               'wcbs_theme_options_render_page' // Function that renders the options page
-       );
-}
-add_action( 'admin_menu', 'wcbs_theme_options_add_page' );
-
-/**
- * Returns an array of sample select options registered for WCBS.
- *
- * @since WCBS 1.0
- */
-function wcbs_sample_select_options() {
-       $sample_select_options = array(
-               '0' => array(
-                       'value' =>   '0',
-                       'label' => __( 'Zero', 'wordcamporg' )
-               ),
-               '1' => array(
-                       'value' =>   '1',
-                       'label' => __( 'One', 'wordcamporg' )
-               ),
-               '2' => array(
-                       'value' => '2',
-                       'label' => __( 'Two', 'wordcamporg' )
-               ),
-               '3' => array(
-                       'value' => '3',
-                       'label' => __( 'Three', 'wordcamporg' )
-               ),
-               '4' => array(
-                       'value' => '4',
-                       'label' => __( 'Four', 'wordcamporg' )
-               ),
-               '5' => array(
-                       'value' => '3',
-                       'label' => __( 'Five', 'wordcamporg' )
-               )
-       );
-
-       return apply_filters( 'wcbs_sample_select_options', $sample_select_options );
-}
-
-/**
- * Returns an array of sample radio options registered for WCBS.
- *
- * @since WCBS 1.0
- */
-function wcbs_sample_radio_buttons() {
-       $sample_radio_buttons = array(
-               'yes' => array(
-                       'value' => 'yes',
-                       'label' => __( 'Yes', 'wordcamporg' )
-               ),
-               'no' => array(
-                       'value' => 'no',
-                       'label' => __( 'No', 'wordcamporg' )
-               ),
-               'maybe' => array(
-                       'value' => 'maybe',
-                       'label' => __( 'Maybe', 'wordcamporg' )
-               )
-       );
-
-       return apply_filters( 'wcbs_sample_radio_buttons', $sample_radio_buttons );
-}
-
-/**
- * Returns the options array for WCBS.
- *
- * @since WCBS 1.0
- */
-function wcbs_get_theme_options() {
-       $saved = (array) get_option( 'wcbs_theme_options' );
-       $defaults = array(
-               'sample_checkbox'       => 'off',
-               'sample_text_input'     => '',
-               'sample_select_options' => '',
-               'sample_radio_buttons'  => '',
-               'sample_textarea'       => '',
-       );
-
-       $defaults = apply_filters( 'wcbs_default_theme_options', $defaults );
-
-       $options = wp_parse_args( $saved, $defaults );
-       $options = array_intersect_key( $options, $defaults );
-
-       return $options;
-}
-
-/**
- * Renders the sample checkbox setting field.
- */
-function wcbs_settings_field_sample_checkbox() {
-       $options = wcbs_get_theme_options();
-       ?>
-       <label for"sample-checkbox">
-               <input type="checkbox" name="wcbs_theme_options[sample_checkbox]" id="sample-checkbox" <?php checked( 'on', $options['sample_checkbox'] ); ?> />
-               <?php _e( 'A sample checkbox.', 'wordcamporg' );  ?>
-       </label>
-       <?php
-}
-
-/**
- * Renders the sample text input setting field.
- */
-function wcbs_settings_field_sample_text_input() {
-       $options = wcbs_get_theme_options();
-       ?>
-       <input type="text" name="wcbs_theme_options[sample_text_input]" id="sample-text-input" value="<?php echo esc_attr( $options['sample_text_input'] ); ?>" />
-       <label class="description" for="sample-text-input"><?php _e( 'Sample text input', 'wordcamporg' ); ?></label>
-       <?php
-}
-
-/**
- * Renders the sample select options setting field.
- */
-function wcbs_settings_field_sample_select_options() {
-       $options = wcbs_get_theme_options();
-       ?>
-       <select name="wcbs_theme_options[sample_select_options]" id="sample-select-options">
-               <?php
-                       $selected = $options['sample_select_options'];
-                       $p = '';
-                       $r = '';
-
-                       foreach ( wcbs_sample_select_options() as $option ) {
-                               $label = $option['label'];
-                               if ( $selected == $option['value'] ) // Make default first in list
-                                       $p = "\n\t<option style=\"padding-right: 10px;\" selected='selected' value='" . esc_attr( $option['value'] ) . "'>$label</option>";
-                               else
-                                       $r .= "\n\t<option style=\"padding-right: 10px;\" value='" . esc_attr( $option['value'] ) . "'>$label</option>";
-                       }
-                       echo $p . $r;
-               ?>
-       </select>
-       <label class="description" for="sample_theme_options[selectinput]"><?php _e( 'Sample select input', 'wordcamporg' ); ?></label>
-       <?php
-}
-
-/**
- * Renders the radio options setting field.
- *
- * @since WCBS 1.0
- */
-function wcbs_settings_field_sample_radio_buttons() {
-       $options = wcbs_get_theme_options();
-
-       foreach ( wcbs_sample_radio_buttons() as $button ) {
-       ?>
-       <div class="layout">
-               <label class="description">
-                       <input type="radio" name="wcbs_theme_options[sample_radio_buttons]" value="<?php echo esc_attr( $button['value'] ); ?>" <?php checked( $options['sample_radio_buttons'], $button['value'] ); ?> />
-                       <?php echo $button['label']; ?>
-               </label>
-       </div>
-       <?php
-       }
-}
-
-/**
- * Renders the sample textarea setting field.
- */
-function wcbs_settings_field_sample_textarea() {
-       $options = wcbs_get_theme_options();
-       ?>
-       <textarea class="large-text" type="text" name="wcbs_theme_options[sample_textarea]" id="sample-textarea" cols="50" rows="10" /><?php echo esc_textarea( $options['sample_textarea'] ); ?></textarea>
-       <label class="description" for="sample-textarea"><?php _e( 'Sample textarea', 'wordcamporg' ); ?></label>
-       <?php
-}
-
-/**
- * Renders the Theme Options administration screen.
- *
- * @since WCBS 1.0
- */
-function wcbs_theme_options_render_page() {
-       ?>
-       <div class="wrap">
-               <?php screen_icon(); ?>
-               <h2><?php printf( __( '%s Theme Options', 'wordcamporg' ), get_current_theme() ); ?></h2>
-               <?php settings_errors(); ?>
-
-               <form method="post" action="options.php">
-                       <?php
-                               settings_fields( 'wcbs_options' );
-                               do_settings_sections( 'theme_options' );
-                               submit_button();
-                       ?>
-               </form>
-       </div>
-       <?php
-}
-
-/**
- * Sanitize and validate form input. Accepts an array, return a sanitized array.
- *
- * @see wcbs_theme_options_init()
- * @todo set up Reset Options action
- *
- * @param array $input Unknown values.
- * @return array Sanitized theme options ready to be stored in the database.
- *
- * @since WCBS 1.0
- */
-function wcbs_theme_options_validate( $input ) {
-       $output = array();
-
-       // Checkboxes will only be present if checked.
-       if ( isset( $input['sample_checkbox'] ) )
-               $output['sample_checkbox'] = 'on';
-
-       // The sample text input must be safe text with no HTML tags
-       if ( isset( $input['sample_text_input'] ) && ! empty( $input['sample_text_input'] ) )
-               $output['sample_text_input'] = wp_filter_nohtml_kses( $input['sample_text_input'] );
-
-       // The sample select option must actually be in the array of select options
-       if ( isset( $input['sample_select_options'] ) && array_key_exists( $input['sample_select_options'], wcbs_sample_select_options() ) )
-               $output['sample_select_options'] = $input['sample_select_options'];
-
-       // The sample radio button value must be in our array of radio button values
-       if ( isset( $input['sample_radio_buttons'] ) && array_key_exists( $input['sample_radio_buttons'], wcbs_sample_radio_buttons() ) )
-               $output['sample_radio_buttons'] = $input['sample_radio_buttons'];
-
-       // The sample textarea must be safe text with the allowed tags for posts
-       if ( isset( $input['sample_textarea'] ) && ! empty( $input['sample_textarea'] ) )
-               $output['sample_textarea'] = wp_filter_post_kses( $input['sample_textarea'] );
-
-       return apply_filters( 'wcbs_theme_options_validate', $output, $input );
-}
</del></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2inctweaksphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/tweaks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/tweaks.php    2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/tweaks.php      2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,52 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Custom functions that act independently of the theme templates
- *
- * Eventually, some of the functionality here could be replaced by core features
- *
- * @package WCBS
- * @since WCBS 1.0
- */
-
-/**
- * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
- *
- * @since WCBS 1.0
- */
-function wcbs_page_menu_args( $args ) {
-       $args['show_home'] = true;
-       return $args;
-}
-add_filter( 'wp_page_menu_args', 'wcbs_page_menu_args' );
-
-/**
- * Adds custom classes to the array of body classes.
- *
- * @since WCBS 1.0
- */
-function wcbs_body_classes( $classes ) {
-       // Adds a class of group-blog to blogs with more than 1 published author
-       if ( is_multi_author() ) {
-               $classes[] = 'group-blog';
-       }
-
-       return $classes;
-}
-add_filter( 'body_class', 'wcbs_body_classes' );
-
-/**
- * Filter in a link to a content ID attribute for the next/previous image links on image attachment pages
- *
- * @since WCBS 1.0
- */
-function wcbs_enhanced_image_navigation( $url, $id ) {
-       if ( ! is_attachment() && ! wp_attachment_is_image( $id ) )
-               return $url;
-
-       $image = get_post( $id );
-       if ( ! empty( $image->post_parent ) && $image->post_parent != $id )
-               $url .= '#main';
-
-       return $url;
-}
-add_filter( 'attachment_link', 'wcbs_enhanced_image_navigation', 10, 2 );
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2incwpcomphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/wpcom.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/wpcom.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/wpcom.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,23 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * WordPress.com-specific functions and definitions
- *
- * @package WCBS
- * @since WCBS 1.0
- */
-
-global $themecolors;
-
-/**
- * Set a default theme color array for WP.com.
- *
- * @global array $themecolors
- * @since WCBS 1.0
- */
-$themecolors = array(
-       'bg' => '',
-       'border' => '',
-       'text' => '',
-       'link' => '',
-       'url' => '',
-);
</del></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libclasswcbmanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/class-wcb-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/class-wcb-manager.php 2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/class-wcb-manager.php   2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,24 +7,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                wcb_maybe_define( 'WCB_LIB_DIR', WCB_DIR . '/lib' );
</span><span class="cx" style="display: block; padding: 0 10px">                wcb_maybe_define( 'WCB_LIB_URL', WCB_URL . '/lib'  );
</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 includes() {
-               require_once WCB_LIB_DIR . '/options/class-wcb-options.php';
-               // require_once WCB_LIB_DIR . '/structure/class-wcb-structure.php';
-               require_once WCB_LIB_DIR . '/speakers/class-wcb-speakers.php';
-               require_once WCB_LIB_DIR . '/sessions/class-wcb-sessions.php';
-               require_once WCB_LIB_DIR . '/sponsors/class-wcb-sponsors.php';
-       }
-
-       function loaded() {
-               $this->components = array(
-                       'options'   => new WCB_Options(),
-                       // 'structure' => new WCB_Structure(),
-                       'speakers'  => ( apply_filters( 'wcb_load_component_speakers', true ) ) ? new WCB_Speakers() : false,
-                       'sessions'  => ( apply_filters( 'wcb_load_component_sessions', true ) ) ? new WCB_Sessions() : false,
-                       'sponsors'  => ( apply_filters( 'wcb_load_component_sponsors', true ) ) ? new WCB_Sponsors() : false,
-               );
-       }
</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"> $GLOBALS['wcb_manager'] = new WCB_Manager;
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbarrayoptionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-array-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-array-option.php    2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-array-option.php      2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,59 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Array_Option extends WCB_Option {
-       var $keys = array();
-
-       function __construct( $args ) {
-               parent::__construct( $args );
-       }
-       /**
-        * Overload get_option to optionally return a key within the returned option.
-        */
-       function get_option( $key=false ) {
-               $option = parent::get_option();
-               if ( empty( $key ) )
-                       return $option;
-
-               if ( isset( $option[ $key ] ) )
-                       return $option[ $key ];
-
-               if ( isset( $this->default[ $key ] ) )
-                       return $this->default[ $key ];
-
-               return false;
-       }
-
-       /**
-        * Overload get_name to optionally add a key index to the result.
-        */
-       function get_name( $key=false ) {
-               $name = parent::get_name();
-               if ( ! empty( $key ) )
-                       $name .= "[$key]";
-               return esc_attr( $name );
-       }
-
-       function validate( $input ) {
-               if ( ! is_array( $input ) )
-                       return null;
-
-               foreach ( $this->keys as $key ) {
-                       $method = "validate_$key";
-                       $value = isset( $input[ $key ] ) ? $input[ $key ] : null;
-                       if ( method_exists( $this, $method ) )
-                               $input[ $key ] = $this->$method( $value );
-               }
-               return $input;
-       }
-
-       function maybe_unserialize( $value ) {
-               $value = maybe_unserialize( $value );
-
-               if ( is_array( $value ) )
-                       $value = array_map( 'maybe_unserialize', $value );
-
-               return $value;
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbbuttonoptionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-button-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-button-option.php   2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-button-option.php     2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,56 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Button_Option extends WCB_Array_Option {
-       var $keys = array('visible', 'text', 'url');
-
-       function validate_visible( $input ) {
-               return $input == 'on';
-       }
-
-       function validate_text( $input ) {
-               return esc_html( $input );
-       }
-
-       function validate_url( $url ) {
-               return esc_url( $url );
-       }
-
-       function render() {
-               $ids = array(
-                       'visible' => 'featured-button-visible',
-                       'text'    => 'featured-button-text',
-                       'url'     => 'featured-button-url',
-               );
-               $class = 'featured-button';
-               if ( $this->get_option('visible') )
-                       $class .= " visible";
-               ?>
-               <tr>
-                       <th><?php esc_html_e( 'Featured Button', 'wordcamporg' ); ?></th>
-                       <td class="<?php echo $class; ?>">
-                               <label class="description checkbox-field" for="<?php echo $ids['visible']; ?>">
-                                       <input type="checkbox" id="<?php echo $ids['visible']; ?>" <?php
-                                               $this->name('visible');
-                                               checked( $this->get_option('visible') );
-                                               ?> />
-                                       <?php echo esc_html_e( 'Show a featured button in the menu.', 'wordcamporg' ); ?>
-                               </label><br />
-                               <label class="description text-field" for="<?php echo $ids['text']; ?>">
-                                       <span><?php esc_html_e( 'Text:', 'wordcamporg' ); ?></span>
-                                       <input type="text" id="<?php echo $ids['text']; ?>"
-                                               <?php $this->name('text'); ?>
-                                               value="<?php echo esc_attr( $this->get_option('text') ); ?>" />
-                               </label><br />
-                               <label class="description text-field" for="<?php echo $ids['url']; ?>">
-                                       <span><?php esc_html_e( 'URL:', 'wordcamporg' ); ?></span>
-                                       <input type="text" id="<?php echo $ids['url']; ?>"
-                                               <?php $this->name('url'); ?>
-                                               value="<?php echo esc_attr( $this->get_option('url') ); ?>" />
-                               </label>
-                       </td>
-               </tr>
-               <?php
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbgridoptionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-grid-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-grid-option.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-grid-option.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,177 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Grid_Option extends WCB_Array_Option {
-       var $label;
-       var $type;
-       var $keys = array('visible', 'layout', 'front_only');
-
-       function __construct( $args ) {
-               parent::__construct( $args );
-               $defaults = array(
-                       'label' => '',
-                       'type' => 'sidebar'
-               );
-               extract( wp_parse_args( $args, $defaults ) );
-               $this->label = $label;
-               $this->type  = $type;
-       }
-
-       function validate_visible( $input ) {
-               return $input == 'on';
-       }
-
-       function validate_front_only( $input ) {
-               return $this->type != 'content' && $input == 'on';
-       }
-
-       function validate_layout( $input ) {
-               $input = unserialize( $input );
-               if ( ! is_array( $input ) )
-                       return null;
-
-               // Match the input to a pre-existing layout.
-               $verbose_input = $this->verbose_row( $input );
-               foreach ( $this->get_layouts() as $set ) {
-                       foreach ( $set as $layout ) {
-                               if ( $this->verbose_row( $layout ) == $verbose_input )
-                                       return serialize( $input );
-                       }
-               }
-
-               return null;
-       }
-
-       function get_layouts() {
-               switch( $this->type ) {
-               case 'content':
-                       return array(
-                               array( // Two columns, left column content
-                                       array( array(12, 'content')    ),
-                                       array( array(9,  'content'), 3 ),
-                                       array( array(8,  'content'), 4 ),
-                                       array( array(6,  'content'), 6 ),
-                               ),
-                               array( // Two columns, right column content
-                                       array( 3, array(9, 'content') ),
-                                       array( 4, array(8, 'content') ),
-                                       array( 6, array(6, 'content') ),
-                               ),
-                               array( // Three columns
-                                       array(    3, array(6, 'content'), 3    ),
-                                       array(       array(6, 'content'), 3, 3 ),
-                                       array( 3, 3, array(6, 'content')       ),
-                               ),
-                       );
-               case 'sidebar':
-               default:
-                       return array(
-                               array( // Evenly spaced columns
-                                       array( 12 ),
-                                       array( 6, 6 ),
-                                       array( 4, 4, 4 ),
-                                       array( 3, 3, 3, 3 ),
-                               ),
-                               array( // Two uneven columns
-                                       array( 9, 3 ),
-                                       array( 8, 4 ),
-                                       array( 3, 9 ),
-                                       array( 4, 8 ),
-                               ),
-                               array( // Three columns
-                                       array( 3, 6, 3 ),
-                                       array( 6, 3, 3 ),
-                                       array( 3, 3, 6 ),
-                               ),
-                       );
-               }
-       }
-
-       function render_visibility() {
-               $visibility_id = esc_attr( "grid-visibility-$this->key" );
-               $grid_row_id = esc_attr( "grid-row-$this->key" );
-               ?>
-               <label class="description visibility-description" for="<?php echo $visibility_id; ?>">
-                       <input type="hidden" class="grid-row-id" value="<?php echo $grid_row_id; ?>" />
-                       <input type="checkbox" id="<?php echo $visibility_id; ?>" <?php
-                               $this->name('visible');
-                               checked( $this->get_option('visible') );
-                               ?> />
-                       <?php echo esc_html( $this->label ); ?>
-               </label>
-               <?php
-       }
-
-       function render_layout() {
-               $layout = $this->get_option('layout');
-               ?>
-               <div id="<?php echo esc_attr("grid-row-$this->key"); ?>" class="grid-row-layout clearfix <?php echo $this->get_option('visible') ? 'visible' : ''; ?>">
-                       <div class="description row-name"><?php echo esc_html( $this->label ); ?></div>
-                       <input class="signature" type="hidden" <?php $this->name('layout'); ?> value="<?php echo esc_attr( serialize( $layout ) ); ?>"/>
-                       <?php $this->render_row( $layout ); ?>
-                       <div class="edit"><a href="#"><?php echo esc_html_e( 'Edit' , 'wordcamporg'); ?></a></div>
-                       <?php if ( $this->type != 'content' ):
-                               $front_page_id = esc_attr( "front-page-only-$this->key" );
-                               ?>
-                               <label class="description front-page" for="<?php echo $front_page_id; ?>">
-                                       <input type="checkbox" id="<?php echo $front_page_id; ?>" <?php
-                                               $this->name('front_only');
-                                               checked( $this->get_option('front_only') );
-                                               ?> />
-                                       <?php esc_html_e( 'Front page only', 'wordcamporg' ); ?>
-                               </label>
-                       <?php endif; ?>
-                       <div class="picker">
-                               <div class="directions">
-                                       <?php esc_html_e( 'Choose a new row layout.', 'wordcamporg' ); ?>
-                                       <a href="#" class="cancel"><?php esc_html_e( 'Cancel' , 'wordcamporg'); ?></a>
-                               </div>
-                               <?php
-                               $current_layout = $this->verbose_row( $this->get_option('layout') );
-                               foreach ( $this->get_layouts() as $rows ): ?>
-                                       <div class="row-config-column clearfix">
-                                       <?php
-                                       foreach ( $rows as $row ):
-                                               $active = $this->verbose_row( $row ) == $current_layout; ?>
-                                               <a href="#" class="grid-row-selector <?php echo $active ? 'active' : ''; ?>">
-                                                       <input class="grid-row-signature" type="hidden" value="<?php echo esc_attr( serialize( $row ) ); ?>"/>
-                                                       <?php $this->render_row( $row ); ?>
-                                               </a>
-                                       <?php endforeach; ?>
-                                       </div>
-                               <?php endforeach; ?>
-                       </div>
-               </div>
-               <?php
-       }
-
-       // Rows can use integers as a shorthand for array( int, 'sidebar' )
-       // For comparison purposes, it's nice to have a standard.
-       function verbose_row( $row ) {
-               foreach ( $row as $i => $v ) {
-                       if ( is_integer( $v ) )
-                               $row[ $i ] = array( $v, 'sidebar' );
-               }
-               return $row;
-       }
-
-       function render_row( $row ) {
-               echo '<div class="grid-row container_12">';
-
-               foreach ( $row as $width ) {
-                       // $width is either an integer, and of $type 'sidebar'...
-                       $type = 'sidebar';
-
-                       // ...or formatted array( $width, $type ).
-                       if ( is_array( $width ) )
-                               list( $width, $type ) = $width;
-
-                       $class = "cell grid_$width $type";
-
-                       echo '<div class="' . esc_attr( $class ) . '"></div>';
-               }
-
-               echo '</div>';
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcboptionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-option.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-option.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,51 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Option {
-       var $key;
-       var $default;
-
-       function __construct( $args ) {
-               $defaults = array(
-                       'key' => '',
-                       'default' => '',
-               );
-               extract( wp_parse_args( $args, $defaults ) );
-               $this->key = $key;
-               $this->default = $default;
-       }
-
-       function maybe_validate( $input ) {
-               if ( isset( $input[ $this->key ] ) )
-                       $input[ $this->key ] = $this->validate( $input[ $this->key ] );
-               return $input;
-       }
-
-       function validate( $input ) {
-               return $input;
-       }
-
-       function render() {}
-
-       function get_option() {
-               $options = get_option( 'wcb_theme_options' );
-               // Use the default value if necessary.
-               return isset( $options[ $this->key ] ) ? $this->maybe_unserialize( $options[ $this->key ] ) : $this->default;
-       }
-
-       function get_name() {
-               $name = 'wcb_theme_options[' . $this->key . ']';
-               return esc_attr( $name );
-       }
-
-       function name() {
-               $args = func_get_args();
-               $name = call_user_func_array( array( &$this, 'get_name' ), $args );
-               echo " name='$name' ";
-       }
-
-       function maybe_unserialize( $value ) {
-               return $value;
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcboptionsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-options.php 2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-options.php   2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,201 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Options extends WCB_Loader {
-       var $options;
-
-       function includes() {
-               $option_slugs = array('option', 'array-option', 'radio-option', 'grid-option', 'button-option', 'typekit-option');
-               foreach ( $option_slugs as $slug ) {
-                       require_once "class-wcb-$slug.php";
-               }
-       }
-
-       function hooks() {
-               add_action('admin_init', array( &$this, 'admin_init' ) );
-               // add_action('admin_menu', array( &$this, 'admin_menu' ) );
-       }
-
-       function loaded() {
-               $this->options['grid'] = new WCB_Radio_Option( array(
-                       'key'       => 'grid',
-                       'default'   => 'grid960',
-                       'label'     => __('Grid Width', 'wordcamporg'),
-                       'values'   => array(
-                               'grid960'   => __( '960px wide', 'wordcamporg' ),
-                               'grid720'   => __( '720px wide', 'wordcamporg' ),
-                       )
-               ) );
-
-               $this->options['after_header'] = new WCB_Grid_Option( array(
-                       'key'       => 'after_header',
-                       'default'   => array(
-                               'visible'       => true,
-                               'layout'        => array( 12 ),
-                               'front_only'    => true,
-                       ),
-                       'label'     => __('After Header', 'wordcamporg'),
-               ) );
-
-               $this->options['before_content'] = new WCB_Grid_Option( array(
-                       'key'       => 'before_content',
-                       'default'   => array(
-                               'visible'       => false,
-                               'layout'        => array( 4,4,4 ),
-                               'front_only'    => true,
-                       ),
-                       'label'     => __('Before Content', 'wordcamporg'),
-               ) );
-
-               $this->options['content'] = new WCB_Grid_Option( array(
-                       'key'       => 'content',
-                       'default'   => array(
-                               'visible'       => true,
-                               'layout'        => array(
-                                       array( 9, 'content' ),
-                                       array( 3, 'sidebar' ),
-                               ),
-                               'front_only'    => false,
-                       ),
-                       'label'     => __('Content', 'wordcamporg'),
-                       'type'      => 'content',
-               ) );
-
-               $this->options['after_content'] = new WCB_Grid_Option( array(
-                       'key'       => 'after_content',
-                       'default'   => array(
-                               'visible'       => false,
-                               'layout'        => array( 4,4,4 ),
-                               'front_only'    => false,
-                       ),
-                       'label'     => __('After Content', 'wordcamporg'),
-               ) );
-
-               $this->options['before_footer'] = new WCB_Grid_Option( array(
-                       'key'       => 'before_footer',
-                       'default'   => array(
-                               'visible'       => true,
-                               'layout'        => array( 3,3,3,3 ),
-                               'front_only'    => false,
-                       ),
-                       'label'     => __('Before Footer', 'wordcamporg'),
-               ) );
-
-               $this->options['featured_button'] = new WCB_Button_Option( array(
-                       'key'       => 'featured_button',
-                       'default'   => array(
-                               'visible'       => false,
-                               'text'          => __('Register now!', 'wordcamporg'),
-                               'url'           => '',
-                       ),
-               ) );
-
-               $this->options['typekit'] = new WCB_Typekit_Option( array(
-                       'key'       => 'typekit',
-                       'default'   => 'jnd4dds',
-                       'label'     => __('Typekit', 'wordcamporg'),
-                       'values'    => array(
-                               'default'   => __( 'Use the default Typekit fonts.', 'wordcamporg' ),
-                               'custom'    => __( 'Use a custom Typekit key:', 'wordcamporg' ),
-                               'off'       => __( 'Do not use any Typekit fonts.', 'wordcamporg' ),
-                       ),
-               ) );
-       }
-
-       function get( $name ) {
-               if ( ! isset( $this->options[ $name ] ) )
-                       return;
-               $values = get_option( 'wcb_theme_options' );
-               $option = $this->options[ $name ];
-
-               return isset( $values[ $option->key ] ) ? $option->maybe_unserialize( $values[ $option->key ] ) : $option->default;
-       }
-
-       function admin_menu() {
-               $page = add_theme_page( __('Theme Options', 'wordcamporg'), __('Theme Options', 'wordcamporg'), 'edit_theme_options', 'wcb-theme-options', array( &$this, 'render' ) );
-
-               add_action("wcb_enqueue_scripts_$page", array( &$this, 'enqueue_scripts' ) );
-       }
-
-       function enqueue_scripts() {
-               wp_enqueue_script( 'wcb-options', wcb_dev_url( WCB_LIB_URL . '/options/js/options.js' ), array('jquery'), '20110212' );
-               wp_enqueue_style( 'wcb-options-grid', wcb_dev_url( WCB_LIB_URL . '/options/css/options-grid.css' ), array(), '20110212' );
-               wp_enqueue_style( 'wcb-options', wcb_dev_url( WCB_LIB_URL . '/options/css/options.css' ), array('wcb-options-grid'), '20110212' );
-       }
-
-       function admin_init() {
-               register_setting( 'wcb_theme_options', 'wcb_theme_options', array( &$this, 'validate' ) );
-       }
-
-       function validate( $input ) {
-               foreach ( $this->options as $option ) {
-                       $input = $option->maybe_validate( $input );
-               }
-
-               return $input;
-       }
-
-       function render() {
-               if ( ! isset( $_REQUEST['updated'] ) )
-                       $_REQUEST['updated'] = false;
-
-               ?>
-               <div class="wrap">
-                       <?php screen_icon(); ?>
-                       <h1><?php echo get_current_theme() . ' ' . __( 'Theme Options', 'wordcamporg' ); ?></h1>
-
-                       <?php if ( false !== $_REQUEST['updated'] ) : ?>
-                               <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcamporg' ); ?></strong></p></div>
-                       <?php endif; ?>
-
-                       <form method="post" action="options.php">
-                               <?php settings_fields( 'wcb_theme_options' ); ?>
-                               <h3><?php _e('General Options', 'wordcamporg'); ?></h3>
-                               <table class="form-table">
-                                       <?php
-                                       $this->options['grid']->render();
-                                       $this->options['featured_button']->render();
-                                       $this->options['typekit']->render();
-                                       ?>
-                               </table>
-
-                               <h3><?php _e('Theme Layout', 'wordcamporg'); ?></h3>
-                               <table class="form-table">
-                                       <?php
-                                       $rows = array( 'after_header', 'before_content', 'content', 'after_content', 'before_footer' ); ?>
-
-                                       <tr id="visibility-row">
-                                               <th><?php esc_html_e( 'Show Rows', 'wordcamporg' ); ?></th>
-                                               <td>
-                                                       <?php foreach ( $rows as $row ) {
-                                                               $this->options[ $row ]->render_visibility();
-                                                       } ?>
-                                               </td>
-                                       </tr>
-
-                                       <tr>
-                                               <th><?php esc_html_e( 'Row Layout', 'wordcamporg' ); ?></th>
-                                               <td>
-                                                       <?php foreach ( $rows as $row ) {
-                                                               $this->options[ $row ]->render_layout();
-                                                       } ?>
-                                               </td>
-                                       </tr>
-
-                               </table>
-                               <p class="submit">
-                                       <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcamporg' ); ?>" />
-                               </p>
-                       </form>
-               </div>
-               <?php
-       }
-}
-
-function wcb_get_option( $name ) {
-       $options = wcb_get('options');
-       $option = $options->get( $name );
-       $option = apply_filters('wcb_get_option', $option, $name );
-       return $option;
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbradiooptionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-radio-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-radio-option.php    2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-radio-option.php      2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,48 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Radio_Option extends WCB_Option {
-       var $label;
-       var $values;
-
-       function __construct( $args ) {
-               parent::__construct( $args );
-               $defaults = array(
-                       'label' => '',
-                       'values' => array()
-               );
-               extract( wp_parse_args( $args, $defaults ) );
-               $this->label = $label;
-               $this->values = $values;
-               if ( empty( $values ) )
-                       return;
-               if ( empty( $this->default ) || ! array_key_exists( $this->default, $this->values ) )
-                       if ( isset( $this->values[0] ) )
-                               $this->default = $this->values[0];
-       }
-
-       function validate( $input ) {
-               // Our radio option must actually be in our array of radio values
-               if ( ! array_key_exists( $input, $this->values ) )
-                       $input = null;
-
-               return $input;
-       }
-
-       function render() {
-               if ( empty( $this->values ) )
-                       return;
-
-               echo "<tr valign='top'><th scope='row'>$this->label</th><td>";
-               echo "<fieldset><legend class='screen-reader-text'><span>$this->label</span></legend>";
-
-               $option = $this->get_option();
-
-               foreach ( $this->values as $value => $label ): ?>
-                       <label class="description"><input type="radio" <?php $this->name(); ?> value="<?php echo esc_attr( $value ); ?>" <?php checked( $value, $option ); ?> /> <?php echo $label; ?></label><br />
-                       <?php
-               endforeach;
-               echo '</fieldset></td></tr>';
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbtypekitoptionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-typekit-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-typekit-option.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-typekit-option.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,50 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Typekit_Option extends WCB_Radio_Option {
-       var $kit_regex = '|^([a-zA-Z0-9]{5}[a-zA-Z0-9]*)$|i';
-
-       function __construct( $args ) {
-               parent::__construct( $args );
-
-               // If the 'custom' label exists, tack on an input field (potentially with the kit id).
-               if ( ! empty( $this->values['custom'] ) ) {
-                       $kit_id = ( $this->get_option() == 'custom' ) ? $this->get_kit_id() : '';
-                       $this->values['custom'] .= ' <input type="text" name="typekit_custom_id" value="' . esc_attr( $kit_id ) . '" />';
-               }
-
-               $this->default = '';
-               if ( ! empty( $args['default'] ) && preg_match( $this->kit_regex, $args['default'] ) )
-                       $this->default = $args['default'];
-       }
-
-       // This option will fake being a radio box (internally, it will navigate labels),
-       // but externally, it will return the kit id.
-       function get_option() {
-               $kit_id = $this->get_kit_id();
-
-               if ( ! $kit_id )
-                       return 'off';
-
-               return ( $kit_id == $this->default ) ? 'default' : 'custom';
-       }
-
-       function get_kit_id() {
-               return parent::get_option();
-       }
-
-       function validate( $input ) {
-               $input = parent::validate( $input );
-
-               $kit_id = '';
-
-               if ( $input == 'default' ) {
-                       $kit_id = $this->default_kit_id;
-
-               } elseif ( $input == 'custom' && ! empty( $_POST['typekit_custom_id'] )
-               && preg_match( $this->kit_regex, $_POST['typekit_custom_id'] ) ) {
-                       $kit_id = $_POST['typekit_custom_id'];
-               }
-
-               return $kit_id;
-       }
-}
</del></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionscssoptionsgridcss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options-grid.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options-grid.css  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options-grid.css    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.container_12{margin-left:auto;margin-right:auto;width:120px;}.grid_1,.grid_2,.grid_3,.grid_4,.grid_5,.grid_6,.grid_7,.grid_8,.grid_9,.grid_10,.grid_11,.grid_12{display:inline;float:left;position:relative;margin-left:2px;margin-right:2px;border-left:1px solid transparent;border-right:1px solid transparent;}.alpha{margin-left:0;}.omega{margin-right:0;}.container_12 .grid_1{width:4px;}.container_12 .grid_2{width:14px;}.container_12 .grid_3{width:24px;}.container_12 .grid_4{width:34px;}.container_12 .grid_5{width:44px;}.container_12 .grid_6{width:54px;}.container_12 .grid_7{width:64px;}.container_12 .grid_8{width:74px;}.container_12 .grid_9{width:84px;}.container_12 .grid_10{width:94px;}.container_12 .grid_11{width:104px;}.container_12 .grid_12{width:114px;}.container_12 .prefix_1{padding-left:10px;}.container_12 .prefix_2{padding-left:20px;}.container_12 .prefix_3{padding-left:30px;}.conta
 iner_12 .prefix_4{padding-left:40px;}.container_12 .prefix_5{padding-left:50px;}.container_12 .prefix_6{padding-left:60px;}.container_12 .prefix_7{padding-left:70px;}.container_12 .prefix_8{padding-left:80px;}.container_12 .prefix_9{padding-left:90px;}.container_12 .prefix_10{padding-left:100px;}.container_12 .prefix_11{padding-left:110px;}.container_12 .suffix_1{padding-right:10px;}.container_12 .suffix_2{padding-right:20px;}.container_12 .suffix_3{padding-right:30px;}.container_12 .suffix_4{padding-right:40px;}.container_12 .suffix_5{padding-right:50px;}.container_12 .suffix_6{padding-right:60px;}.container_12 .suffix_7{padding-right:70px;}.container_12 .suffix_8{padding-right:80px;}.container_12 .suffix_9{padding-right:90px;}.container_12 .suffix_10{padding-right:100px;}.container_12 .suffix_11{padding-right:110px;}.container_12 .push_1{left:10px;}.container_12 .push_2{left:20px;}.container_12 .push_3{left:30px;}.container_12 .push_4{left:40px;}.container_12 .push_5{left:50px;}.c
 ontainer_12 .push_6{left:60px;}.container_12 .push_7{left:70px;}.container_12 .push_8{left:80px;}.container_12 .push_9{left:90px;}.container_12 .push_10{left:100px;}.container_12 .push_11{left:110px;}.container_12 .pull_1{left:-10px;}.container_12 .pull_2{left:-20px;}.container_12 .pull_3{left:-30px;}.container_12 .pull_4{left:-40px;}.container_12 .pull_5{left:-50px;}.container_12 .pull_6{left:-60px;}.container_12 .pull_7{left:-70px;}.container_12 .pull_8{left:-80px;}.container_12 .pull_9{left:-90px;}.container_12 .pull_10{left:-100px;}.container_12 .pull_11{left:-110px;}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0;}.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0;}.clearfix{display:inline-block;}* html .clearfix{height:1%;}.clearfix{display:block;}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionscssoptionsgriddevcss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options-grid.dev.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options-grid.dev.css      2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options-grid.dev.css        2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,340 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
-       Variable Grid System.
-       Learn more ~ http://www.spry-soft.com/grids/
-       Based on 960 Grid System - http://960.gs/
-
-       Licensed under GPL and MIT.
-*/
-
-
-/* Containers
-----------------------------------------------------------------------------------------------------*/
-.container_12 {
-       margin-left: auto;
-       margin-right: auto;
-       width: 120px;
-}
-
-/* Grid >> Global
-----------------------------------------------------------------------------------------------------*/
-
-.grid_1,
-.grid_2,
-.grid_3,
-.grid_4,
-.grid_5,
-.grid_6,
-.grid_7,
-.grid_8,
-.grid_9,
-.grid_10,
-.grid_11,
-.grid_12 {
-       display:inline;
-       float: left;
-       position: relative;
-       margin-left: 2px;
-       margin-right: 2px;
-       border-left: 1px solid transparent;
-       border-right: 1px solid transparent;
-}
-
-/* Grid >> Children (Alpha ~ First, Omega ~ Last)
-----------------------------------------------------------------------------------------------------*/
-
-.alpha {
-       margin-left: 0;
-}
-
-.omega {
-       margin-right: 0;
-}
-
-/* Grid >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .grid_1 {
-       width:4px;
-}
-
-.container_12 .grid_2 {
-       width:14px;
-}
-
-.container_12 .grid_3 {
-       width:24px;
-}
-
-.container_12 .grid_4 {
-       width:34px;
-}
-
-.container_12 .grid_5 {
-       width:44px;
-}
-
-.container_12 .grid_6 {
-       width:54px;
-}
-
-.container_12 .grid_7 {
-       width:64px;
-}
-
-.container_12 .grid_8 {
-       width:74px;
-}
-
-.container_12 .grid_9 {
-       width:84px;
-}
-
-.container_12 .grid_10 {
-       width:94px;
-}
-
-.container_12 .grid_11 {
-       width:104px;
-}
-
-.container_12 .grid_12 {
-       width:114px;
-}
-
-
-
-/* Prefix Extra Space >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .prefix_1 {
-       padding-left:10px;
-}
-
-.container_12 .prefix_2 {
-       padding-left:20px;
-}
-
-.container_12 .prefix_3 {
-       padding-left:30px;
-}
-
-.container_12 .prefix_4 {
-       padding-left:40px;
-}
-
-.container_12 .prefix_5 {
-       padding-left:50px;
-}
-
-.container_12 .prefix_6 {
-       padding-left:60px;
-}
-
-.container_12 .prefix_7 {
-       padding-left:70px;
-}
-
-.container_12 .prefix_8 {
-       padding-left:80px;
-}
-
-.container_12 .prefix_9 {
-       padding-left:90px;
-}
-
-.container_12 .prefix_10 {
-       padding-left:100px;
-}
-
-.container_12 .prefix_11 {
-       padding-left:110px;
-}
-
-
-
-/* Suffix Extra Space >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .suffix_1 {
-       padding-right:10px;
-}
-
-.container_12 .suffix_2 {
-       padding-right:20px;
-}
-
-.container_12 .suffix_3 {
-       padding-right:30px;
-}
-
-.container_12 .suffix_4 {
-       padding-right:40px;
-}
-
-.container_12 .suffix_5 {
-       padding-right:50px;
-}
-
-.container_12 .suffix_6 {
-       padding-right:60px;
-}
-
-.container_12 .suffix_7 {
-       padding-right:70px;
-}
-
-.container_12 .suffix_8 {
-       padding-right:80px;
-}
-
-.container_12 .suffix_9 {
-       padding-right:90px;
-}
-
-.container_12 .suffix_10 {
-       padding-right:100px;
-}
-
-.container_12 .suffix_11 {
-       padding-right:110px;
-}
-
-
-
-/* Push Space >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .push_1 {
-       left:10px;
-}
-
-.container_12 .push_2 {
-       left:20px;
-}
-
-.container_12 .push_3 {
-       left:30px;
-}
-
-.container_12 .push_4 {
-       left:40px;
-}
-
-.container_12 .push_5 {
-       left:50px;
-}
-
-.container_12 .push_6 {
-       left:60px;
-}
-
-.container_12 .push_7 {
-       left:70px;
-}
-
-.container_12 .push_8 {
-       left:80px;
-}
-
-.container_12 .push_9 {
-       left:90px;
-}
-
-.container_12 .push_10 {
-       left:100px;
-}
-
-.container_12 .push_11 {
-       left:110px;
-}
-
-
-
-/* Pull Space >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .pull_1 {
-       left:-10px;
-}
-
-.container_12 .pull_2 {
-       left:-20px;
-}
-
-.container_12 .pull_3 {
-       left:-30px;
-}
-
-.container_12 .pull_4 {
-       left:-40px;
-}
-
-.container_12 .pull_5 {
-       left:-50px;
-}
-
-.container_12 .pull_6 {
-       left:-60px;
-}
-
-.container_12 .pull_7 {
-       left:-70px;
-}
-
-.container_12 .pull_8 {
-       left:-80px;
-}
-
-.container_12 .pull_9 {
-       left:-90px;
-}
-
-.container_12 .pull_10 {
-       left:-100px;
-}
-
-.container_12 .pull_11 {
-       left:-110px;
-}
-
-
-
-
-/* Clear Floated Elements
-----------------------------------------------------------------------------------------------------*/
-
-/* http://sonspring.com/journal/clearing-floats */
-
-.clear {
-       clear: both;
-       display: block;
-       overflow: hidden;
-       visibility: hidden;
-       width: 0;
-       height: 0;
-}
-
-/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
-
-.clearfix:after {
-       clear: both;
-       content: ' ';
-       display: block;
-       font-size: 0;
-       line-height: 0;
-       visibility: hidden;
-       width: 0;
-       height: 0;
-}
-
-.clearfix {
-       display: inline-block;
-}
-
-* html .clearfix {
-       height: 1%;
-}
-
-.clearfix {
-       display: block;
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionscssoptionscss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options.css       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options.css 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-h3{padding-top:20px;}.featured-button .checkbox-field,.featured-button.visible .text-field{display:inline-block;}.featured-button .text-field{display:none;}.featured-button .checkbox-field{margin-bottom:10px;}.text-field{padding-top:3px;}.text-field span{display:inline-block;min-width:30px;}#visibility-row td{padding-bottom:30px;}.visibility-description{padding-right:20px;}.grid-row-layout{display:none;}.grid-row-layout.visible{display:block;}.grid-row-layout .row-name{width:95px;padding-right:5px;float:left;text-align:right;}.grid-row-layout .edit{float:left;}.grid-row-layout a{text-decoration:none;}.grid-row-layout .front-page{margin-left:50px;}.grid-row-layout .picker{display:none;float:left;clear:left;margin:5px 0 20px 90px;padding:7px 9px 2px;border:1px solid #dfdfdf;background:#fff;}.grid-row-layout .picker .directions{padding-bottom:5px;margin-bottom:10px;border-bottom:1px solid #
 f4f4f4;}.grid-row-layout .cancel{float:right;display:block;line-height:15px;color:#21759B;border-bottom:1px solid #21759B;padding:1px 2px;text-decoration:none;}.grid-row-layout .cancel:hover{background:#21759B;color:#fff;}.grid-row-options{width:140px;}.row-config-column{float:left;width:120px;margin-right:15px;}.row-config-column .grid-row{margin-bottom:10px;}.grid-row{float:left;margin:0 5px 5px 0;text-decoration:none;height:20px;}.unknown .grid-row{background:#fff;border:1px solid #dfdfdf;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;padding:2px 1px;}.grid-row .cell{background:#dfdfdf;height:18px;text-align:center;font-size:10px;color:#777;border:1px solid #999;}.grid-row .content{background:#EAF2FA;border-color:#21759B;color:#555;}.grid-row-selector:hover .grid-row,.grid-row-selector.active .grid-row{border:1px dashed #21759B;padding:3px 1px;background:transparent;color:#555;margin:-4px 3px 6px -2px;}.grid-row-selector.active .grid-row{border-color:#aaa;}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionscssoptionsdevcss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options.dev.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options.dev.css   2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/css/options.dev.css     2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,192 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-h3 {
-       padding-top: 20px;
-}
-
-.featured-button .checkbox-field,
-.featured-button.visible .text-field {
-       display: inline-block;
-}
-.featured-button .text-field {
-       display: none;
-}
-
-.featured-button .checkbox-field {
-       margin-bottom: 10px;
-}
-.text-field {
-       padding-top: 3px;
-}
-.text-field span {
-       display: inline-block;
-       min-width: 30px;
-}
-
-/*.visible-only {
-       display: none;
-}
-.visible .visible-only {
-       display: block;
-}
-*/
-#visibility-row td {
-       padding-bottom: 30px;
-}
-.visibility-description {
-       padding-right: 20px;
-}
-
-.grid-row-layout {
-       display: none;
-}
-
-.grid-row-layout.visible {
-       display: block;
-}
-.grid-row-layout .row-name {
-       width: 95px;
-       padding-right: 5px;
-       float: left;
-       text-align: right;
-}
-.grid-row-layout .edit {
-       float: left;
-}
-.grid-row-layout a {
-       text-decoration: none;
-}
-.grid-row-layout .front-page {
-       margin-left: 50px;
-}
-
-.grid-row-layout .picker {
-       display: none;
-       float: left;
-       clear: left;
-       margin: 5px 0 20px 90px;
-       padding: 7px 9px 2px;
-       border: 1px solid #dfdfdf;
-       background: #fff;
-}
-
-.grid-row-layout .picker .directions {
-       padding-bottom: 5px;
-       margin-bottom: 10px;
-       border-bottom: 1px solid #f4f4f4;
-}
-.grid-row-layout .cancel {
-       float: right;
-       display:block;
-       line-height: 15px;
-       color: #21759B;
-       border-bottom: 1px solid #21759B;
-       padding: 1px 2px;
-       text-decoration: none;
-}
-.grid-row-layout .cancel:hover {
-       background: #21759B;
-       color: #fff;
-}
-
-.grid-row-options {
-       width: 140px;
-}
-
-.row-config-column {
-       float: left;
-       width: 120px;
-       margin-right: 15px;
-}
-
-.row-config-column .grid-row {
-       margin-bottom: 10px;
-}
-
-.grid-row {
-       float: left;
-       margin: 0 5px 5px 0;
-       text-decoration: none;
-       height: 20px;
-}
-.unknown .grid-row {
-       background: #fff;
-       border: 1px solid #dfdfdf;
-/*     -moz-border-radius: 6px;
-       -webkit-border-radius: 6px;
-       border-radius: 6px;*/
-       -moz-border-radius: 4px;
-       -webkit-border-radius: 4px;
-       border-radius: 4px;
-/*     width: 100px;*/
-/*     padding: 3px 2px 3px 1px;*/
-       padding: 2px 1px;
-}
-.grid-row .cell {
-       background: #dfdfdf;
-       height: 18px;
-       text-align: center;
-       font-size: 10px;
-       color: #777;
-/*     -moz-border-radius: 4px;
-       -webkit-border-radius: 4px;
-       border-radius: 4px;*/
-/*     -moz-border-radius: 3px;
-       -webkit-border-radius: 3px;
-       border-radius: 3px;*/
-       border: 1px solid #999;
-}
-
-.grid-row .content {
-/*     background-color: #fff;*/
-       background: #EAF2FA;
-       border-color: #21759B;
-       color: #555;
-/*     border-color: #E6DB55;
-       background: #FFFFE0;
-       color: #555;*/
-}
-
-/*.row-config:hover .row {
-       border-color: #ccc;
-}
-.row-config:hover .cell {
-       background: #EAF2FA;
-       border-color: #21759B;
-       color: #555;
-}*/
-
-
-/*
-.grid-row-selector:hover .grid-row,
-.grid-row-selector.active .grid-row {
-       border: 1px dashed #21759B;
-       padding: 2px 0px;
-       background: transparent;
-       color: #555;
-       margin: -3px 2px 7px -1px;
-}*/
-
-.grid-row-selector:hover .grid-row,
-.grid-row-selector.active .grid-row {
-       border: 1px dashed #21759B;
-       padding: 3px 1px;
-       background: transparent;
-       color: #555;
-       margin: -4px 3px 6px -2px;
-}
-.grid-row-selector.active .grid-row {
-       border-color: #aaa;
-}
-
-
-/*.grid-row-selector:hover .cell,
-.grid-row-selector.active .cell {
-       border-color: #E6DB55;
-       background: #FFFFE0;
-       color: #555;
-}
-.grid-row-selector:hover .content,
-.grid-row-selector.active .content {
-       border-color: #a3df29;
-       background: #f6fce9;
-}
-*/
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsjsoptionsdevjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/js/options.dev.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/js/options.dev.js     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/js/options.dev.js       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,60 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function($){
-       function initGridOptions() {
-               $('#visibility-row input[type="checkbox"]').change( function() {
-                       var t = $(this),
-                               id = t.siblings('.grid-row-id').val();
-
-                       $( '#' + id ).toggle( t.is(':checked') );
-               });
-
-
-               $('.grid-row-layout .edit').click( function() {
-                       var picker = $(this).siblings('.picker');
-
-                       if ( ! picker.is(':visible') )
-                               picker.slideDown('fast');
-
-                       return false;
-               });
-
-               $('.grid-row-layout .cancel').click( function() {
-                       var picker = $(this).parents('.picker');
-
-                       picker.slideUp('fast');
-                       return false;
-               });
-
-               $('.grid-row-selector').click( function() {
-                       var t = $(this);
-                               picker = t.parents('.picker'),
-                               layout = t.parents('.grid-row-layout'),
-                               selected = layout.children('.grid-row'),
-                               signature = layout.children('.signature'),
-                               active = picker.find('.active');
-
-                       // Update the selected row's contents
-                       selected.html( t.children('.grid-row').html() );
-                       signature.val( t.children('.grid-row-signature').val() );
-
-                       // Update the picker's active row
-                       active.removeClass('active');
-                       t.addClass('active');
-
-                       // Close the picker
-                       picker.slideUp('fast');
-                       return false;
-               });
-       };
-
-       function initFeaturedButton() {
-               $('#featured-button-visible').change( function() {
-                       var t = $(this);
-                       t.parents('.featured-button').toggleClass('visible', t.is(':checked') );
-               });
-       }
-
-       $(document).ready( function(){
-               initGridOptions();
-               initFeaturedButton();
-       });
-})(jQuery);
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsjsoptionsjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/js/options.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/js/options.js 2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/js/options.js   2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function(c){function b(){c('#visibility-row input[type="checkbox"]').change(function(){var d=c(this),e=d.siblings(".grid-row-id").val();c("#"+e).toggle(d.is(":checked"))});c(".grid-row-layout .edit").click(function(){var d=c(this).siblings(".picker");if(!d.is(":visible")){d.slideDown("fast")}return false});c(".grid-row-layout .cancel").click(function(){var d=c(this).parents(".picker");d.slideUp("fast");return false});c(".grid-row-selector").click(function(){var d=c(this);picker=d.parents(".picker"),layout=d.parents(".grid-row-layout"),selected=layout.children(".grid-row"),signature=layout.children(".signature"),active=picker.find(".active");selected.html(d.children(".grid-row").html());signature.val(d.children
 (".grid-row-signature").val());active.removeClass("active");d.addClass("active");picker.slideUp("fast");return false})}function a(){c("#featured-button-visible").change(function(){var d=c(this);d.parents(".featured-button").toggleClass("visible",d.is(":checked"))})}c(document).ready(function(){b();a()})})(jQuery);
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsessionsclasswcbsessiontemplatephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-session-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-session-template.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-session-template.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,119 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * wcb_session_query()
- *
- * Creates and fetches the session query.
- *
- * @return WP_Query The session query.
- */
-function wcb_session_query( $args = '' ) {
-       global $wcb_session_query;
-
-       if ( isset( $wcb_session_query ) )
-               return $wcb_session_query;
-
-       $defaults = array(
-               'post_type'         => WCB_SESSION_POST_TYPE,
-               'orderby'           => 'title',
-               'order'             => 'DESC',
-               'posts_per_page'    => -1,
-       );
-       $args = wp_parse_args( $args, $defaults );
-
-       $wcb_session_query = new WP_Query( $args );
-
-       return $wcb_session_query;
-}
-
-/**
- * wcb_have_sessions()
- *
- * Whether there are more sessions available in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_have_sessions() {
-       $query = wcb_session_query();
-       return $query->have_posts();
-}
-
-/**
- * wcb_rewind_sessions()
- *
- * Rewind the sessions loop.
- */
-function wcb_rewind_sessions() {
-       $query = wcb_session_query();
-       return $query->rewind_posts();
-}
-
-/**
- * wcb_the_session()
- *
- * Loads up the current session in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_the_session() {
-       $query = wcb_session_query();
-       return $query->the_post();
-}
-
-/**
- * wcb_get_session_speakers()
- *
- * Gets the speakers for the current session.
- *
- * @return object WordCamp information
- */
-function wcb_get_session_speakers() {
-       $sessions = wcb_get('sessions');
-       return esc_html( $sessions->meta_manager->get( get_the_ID(), 'speakers' ) );
-}
-
-
-/**
- * wcb_get_session_track()
- *
- * Gets the track for the current session.
- *
- * @return object WordCamp information
- */
-function wcb_get_session_track() {
-       $track = get_the_terms( get_the_ID(), WCB_TRACK_TAXONOMY );
-
-       if ( empty( $track ) )
-               return '';
-
-       $track = array_values( $track );
-       return $track[0]->name;
-}
-
-
-function wcb_session_entry_meta( $meta ) {
-       if ( get_post_type() == WCB_SESSION_POST_TYPE ) {
-               $track  = wcb_get_session_track();
-
-               $meta['speakers']   = sprintf( __('Presented by %s', 'wordcamporg'), wcb_get_session_speakers() );
-
-               if ( empty( $track ) ) {
-                       $meta['order']  = array('speakers', 'edit');
-
-               } else {
-                       $meta['track'] = sprintf( __('%s Track', 'wordcamporg'), $track );
-
-                       $link = get_term_link( $track, WCB_TRACK_TAXONOMY );
-                       if ( ! is_wp_error( $link ) ) {
-                               $meta['track'] = "<a href='$link'>{$meta['track']}</a>";
-                       }
-
-                       $meta['order']  = array('speakers', 'sep', 'track', 'edit');
-               }
-       }
-
-       return $meta;
-}
-add_filter( 'wcb_entry_meta', 'wcb_session_entry_meta' );
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsessionsclasswcbsessionsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-sessions.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-sessions.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,135 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Sessions extends WCB_Loader {
-       var $meta_manager;
-
-       function constants() {
-               wcb_maybe_define( 'WCB_SESSION_POST_TYPE', 'wcb_session', 'wcb_session_post_type' );
-               wcb_maybe_define( 'WCB_SESSION_SLUG',      'session',     'wcb_session_slug'      );
-               wcb_maybe_define( 'WCB_TRACK_TAXONOMY',    'wcb_track',   'wcb_track_taxonomy'    );
-       }
-
-       function includes() {
-               require_once "class-wcb-session-template.php";
-       }
-
-       function loaded() {
-               $this->meta_manager = new WCB_Post_Meta_Manager( array(
-                       'prefix'    => 'wcb_session',
-                       'keys'      => array('speakers'),
-               ) );
-
-               if ( is_admin() ) {
-                       $meta_fields = array(
-                               'speakers'  => array(
-                                       'type'      => 'text',
-                                       'label'     => __('Speakers', 'wordcamporg'),
-                               )
-                       );
-
-                       $box = wcb_get_metabox( 'WCB_Post_Metabox' );
-                       $box->add_instance( WCB_SESSION_POST_TYPE, array(
-                               'title'          => __('Speakers', 'wordcamporg'),
-                               'meta_manager'   => $this->meta_manager,
-                               'meta_fields'    => $meta_fields,
-                               'context'        => 'normal',
-                               'priority'       => 'high',
-                       ) );
-               }
-       }
-
-       function register_post_types() {
-               // Session post type labels
-               $labels = array (
-                       'name'                  => __( 'Sessions', 'wordcamporg' ),
-                       'singular_name'         => __( 'Session', 'wordcamporg' ),
-                       'add_new'               => __( 'Add New', 'wordcamporg' ),
-                       'add_new_item'          => __( 'Create New Session', 'wordcamporg' ),
-                       'edit'                  => __( 'Edit', 'wordcamporg' ),
-                       'edit_item'             => __( 'Edit Session', 'wordcamporg' ),
-                       'new_item'              => __( 'New Session', 'wordcamporg' ),
-                       'view'                  => __( 'View Session', 'wordcamporg' ),
-                       'view_item'             => __( 'View Session', 'wordcamporg' ),
-                       'search_items'          => __( 'Search Sessions', 'wordcamporg' ),
-                       'not_found'             => __( 'No sessions found', 'wordcamporg' ),
-                       'not_found_in_trash'    => __( 'No sessions found in Trash', 'wordcamporg' ),
-                       'parent_item_colon'     => __( 'Parent Session:', 'wordcamporg' )
-               );
-
-               // Session post type rewrite
-               $rewrite = array (
-                       'slug'        => WCB_SESSION_SLUG,
-                       'with_front'  => false,
-               );
-
-               // Session post type supports
-               $supports = array (
-                       'title',
-                       'editor',
-                       'revisions',
-                       'thumbnail',
-               );
-
-               $menu_icon = wcb_menu_icon( WCB_SESSION_POST_TYPE, WCB_URL . '/images/sessions.png' );
-
-               // Register session post type
-               register_post_type (
-                       WCB_SESSION_POST_TYPE,
-                       apply_filters( 'wcb_session_register_post_type',
-                               array (
-                                       'labels'            => $labels,
-                                       'rewrite'           => $rewrite,
-                                       'supports'          => $supports,
-                                       'menu_position'     => 21,
-                                       'public'            => true,
-                                       'show_ui'           => true,
-                                       'can_export'        => true,
-                                       'capability_type'   => 'post',
-                                       'hierarchical'      => false,
-                                       'query_var'         => true,
-                                       'menu_icon'         => $menu_icon,
-                               )
-                       )
-               );
-       }
-
-       function register_taxonomies() {
-
-               // Labels
-               $labels = array (
-                       'name'              => __( 'Tracks', 'wordcamporg'),
-                       'singular_name'     => __( 'Track', 'wordcamporg'),
-                       'search_items'      => __( 'Search Tracks', 'wordcamporg'),
-                       'popular_items'     => __( 'Popular Tracks','wordcampbase'),
-                       'all_items'         => __( 'All Tracks', 'wordcamporg'),
-                       'edit_item'         => __( 'Edit Track', 'wordcamporg'),
-                       'update_item'       => __( 'Update Track', 'wordcamporg'),
-                       'add_new_item'      => __( 'Add Track', 'wordcamporg'),
-                       'new_item_name'     => __( 'New Track', 'wordcamporg'),
-               );
-
-               // Rewrite
-               $rewrite = array (
-                       'slug' => 'track'
-               );
-
-               // Register the taxonomy
-               register_taxonomy (
-                       WCB_TRACK_TAXONOMY,             // The tax ID
-                       WCB_SESSION_POST_TYPE,          // The post type ID
-                       apply_filters( 'wcb_track_taxonomy_register',
-                               array (
-                                       'labels'                => $labels,
-                                       'rewrite'               => $rewrite,
-                                       'query_var'             => 'track',
-                                       'hierarchical'          => true,
-                                       'public'                => true,
-                                       'show_ui'               => true,
-                               )
-                       )
-               );
-       }
-
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libspeakersclasswcbspeakertemplatephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speaker-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speaker-template.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speaker-template.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,109 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * wcb_speaker_query()
- *
- * Creates and fetches the speaker query.
- *
- * @return WP_Query The speaker query.
- */
-function wcb_speaker_query( $args = '' ) {
-       global $wcb_speaker_query;
-
-       if ( isset( $wcb_speaker_query ) )
-               return $wcb_speaker_query;
-
-
-       $defaults = array(
-               'post_type'         => WCB_SPEAKER_POST_TYPE,
-               'orderby'           => 'title',
-               'order'             => 'DESC',
-               'posts_per_page'    => -1,
-       );
-       $args = wp_parse_args( $args, $defaults );
-
-       $wcb_speaker_query = new WP_Query( $args );
-
-       // Sort posts by last name
-       // (by last word in the title, really)
-       $sorter = array();
-       foreach ( $wcb_speaker_query->posts as $speaker ) {
-               // Place the "last name" first.
-               $name_parts     = explode( " ", trim( $speaker->post_title ) );
-               $inverted_name  = array_pop( $name_parts ) . " " . implode( " ", $name_parts );
-
-               // Ensure our name is unique.
-               $sorted_name    = $inverted_name;
-               $index          = 0;
-               while ( isset( $sorter[ $sorted_name ] ) ) {
-                       $index++;
-                       $sorted_name = $inverted_name . $index;
-               }
-
-               $sorter[ $sorted_name ] = $speaker;
-       }
-       ksort( $sorter );
-       $wcb_speaker_query->posts = array_values( $sorter );
-
-       return $wcb_speaker_query;
-}
-
-/**
- * wcb_have_speakers()
- *
- * Whether there are more speakers available in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_have_speakers() {
-       $query = wcb_speaker_query();
-       return $query->have_posts();
-}
-
-/**
- * wcb_rewind_speakers()
- *
- * Rewind the speakers loop.
- */
-function wcb_rewind_speakers() {
-       $query = wcb_speaker_query();
-       return $query->rewind_posts();
-}
-
-/**
- * wcb_the_speaker()
- *
- * Loads up the current speaker in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_the_speaker() {
-       $query = wcb_speaker_query();
-       return $query->the_post();
-}
-
-/**
- * wcb_get_speaker_gravatar()
- *
- * Gets the gravatar of the current speaker.
- *
- * @return object WordCamp information
- */
-function wcb_get_speaker_gravatar( $size=96 ) {
-       $speakers = wcb_get('speakers');
-       return get_avatar( $speakers->meta_manager->get( get_the_ID(), 'email' ), $size );
-}
-
-/**
- * wcb_get_speaker_slug()
- *
- * Gets the slug for the current speaker.
- *
- * @return object WordCamp information
- */
-function wcb_get_speaker_slug() {
-       global $post;
-       return $post->post_name;
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libspeakersclasswcbspeakersphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speakers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speakers.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speakers.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,94 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Speakers extends WCB_Loader {
-       var $meta_manager;
-
-       function constants() {
-               wcb_maybe_define( 'WCB_SPEAKER_POST_TYPE', 'wcb_speaker', 'wcb_speaker_post_type' );
-               wcb_maybe_define( 'WCB_SPEAKER_SLUG',      'speaker',     'wcb_speaker_slug'      );
-       }
-
-       function includes() {
-               require_once "class-wcb-speaker-template.php";
-       }
-
-       function loaded() {
-               $this->meta_manager = new WCB_Post_Meta_Manager( array(
-                       'prefix'    => 'wcb_speaker',
-                       'keys'      => array('email'),
-               ) );
-
-               if ( is_admin() ) {
-                       $meta_fields = array(
-                               'email'     => array(
-                                       'type'      => 'text',
-                                       'label'     => __('Gravatar Email', 'wordcamporg'),
-                               )
-                       );
-
-                       $box = wcb_get_metabox( 'WCB_Post_Metabox' );
-                       $box->add_instance( WCB_SPEAKER_POST_TYPE, array(
-                               'title'          => __('Gravatar Email', 'wordcamporg'),
-                               'meta_manager'   => $this->meta_manager,
-                               'meta_fields'    => $meta_fields,
-                       ) );
-               }
-       }
-
-       function register_post_types() {
-               // Speaker post type labels
-               $labels = array (
-                       'name'                  => __( 'Speakers', 'wordcamporg' ),
-                       'singular_name'         => __( 'Speaker', 'wordcamporg' ),
-                       'add_new'               => __( 'Add New', 'wordcamporg' ),
-                       'add_new_item'          => __( 'Create New Speaker', 'wordcamporg' ),
-                       'edit'                  => __( 'Edit', 'wordcamporg' ),
-                       'edit_item'             => __( 'Edit Speaker', 'wordcamporg' ),
-                       'new_item'              => __( 'New Speaker', 'wordcamporg' ),
-                       'view'                  => __( 'View Speaker', 'wordcamporg' ),
-                       'view_item'             => __( 'View Speaker', 'wordcamporg' ),
-                       'search_items'          => __( 'Search Speakers', 'wordcamporg' ),
-                       'not_found'             => __( 'No speakers found', 'wordcamporg' ),
-                       'not_found_in_trash'    => __( 'No speakers found in Trash', 'wordcamporg' ),
-                       'parent_item_colon'     => __( 'Parent Speaker:', 'wordcamporg' )
-               );
-
-               // Speaker post type rewrite
-               $rewrite = array (
-                       'slug'        => WCB_SPEAKER_SLUG,
-                       'with_front'  => false,
-               );
-
-               // Speaker post type supports
-               $supports = array (
-                       'title',
-                       'editor',
-                       'revisions',
-               );
-
-               $menu_icon = wcb_menu_icon( WCB_SPEAKER_POST_TYPE, WCB_URL . '/images/speakers.png' );
-
-               // Register speaker post type
-               register_post_type (
-                       WCB_SPEAKER_POST_TYPE,
-                       apply_filters( 'wcb_speaker_register_post_type',
-                               array (
-                                       'labels'            => $labels,
-                                       'rewrite'           => $rewrite,
-                                       'supports'          => $supports,
-                                       'menu_position'     => 20,
-                                       'public'            => false,
-                                       'show_ui'           => true,
-                                       'can_export'        => true,
-                                       'capability_type'   => 'post',
-                                       'hierarchical'      => false,
-                                       'query_var'         => true,
-                                       'menu_icon'         => $menu_icon,
-                               )
-                       )
-               );
-       }
-
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsororderphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-order.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-order.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-order.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,117 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Sponsor_Order extends WCB_Loader {
-
-       function hooks() {
-               add_action('admin_init',     array( &$this, 'admin_init' )        );
-               add_action('admin_menu',     array( &$this, 'admin_menu' )        );
-
-               add_filter('wcb_get_option', array( &$this, 'get_option' ), 10, 2 );
-       }
-
-       function admin_menu() {
-               $page = add_submenu_page(
-                       'edit.php?post_type=' . WCB_SPONSOR_POST_TYPE,  // Page type
-                       __('Order Sponsor Levels', 'wordcamporg'),              // Page title
-                       __('Order Sponsor Levels', 'wordcamporg'),              // Menu title
-                       'edit_posts',                                   // Capability
-                       'sponsor_levels',                               // Menu slug
-                       array( &$this, 'render' )                       // Callback
-               );
-
-               add_action("wcb_enqueue_scripts_$page", array( &$this, 'enqueue_scripts' ) );
-       }
-
-       function enqueue_scripts() {
-               wp_enqueue_script( 'wcb-sponsor-order', wcb_dev_url( WCB_LIB_URL . '/sponsors/js/order.js' ), array('jquery-ui-sortable'), '20110212' );
-               wp_enqueue_style( 'wcb-sponsor-order', wcb_dev_url( WCB_LIB_URL . '/sponsors/css/order.css' ), array(), '20110212' );
-       }
-
-       function admin_init() {
-               register_setting( 'wcb_sponsor_options', $this->get_name(), array( &$this, 'validate' ) );
-       }
-
-       function validate( $input ) {
-               if ( ! is_array( $input ) ) {
-                       $input = null;
-               } else {
-                       foreach ( $input as $key => $value ) {
-                               $input[ $key ] = (int) $input[ $key ];
-                       }
-                       $input = array_values( $input );
-               }
-
-               return $input;
-       }
-
-       function get_name() {
-               return 'wcb_sponsor_level_order';
-       }
-
-       function render() {
-               if ( ! isset( $_REQUEST['updated'] ) )
-                       $_REQUEST['updated'] = false;
-
-               $levels = $this->get_levels();
-               ?>
-               <div class="wrap">
-                       <?php screen_icon(); ?>
-                       <h1><?php _e( 'Order Sponsor Levels', 'wordcamporg' ); ?></h1>
-
-                       <?php if ( false !== $_REQUEST['updated'] ) : ?>
-                               <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcamporg' ); ?></strong></p></div>
-                       <?php endif; ?>
-
-                       <form method="post" action="options.php">
-                               <?php settings_fields( 'wcb_sponsor_options' ); ?>
-                               <div class="description sponsor-order-instructions">
-                                       <?php _e('Change the order of sponsor levels are displayed in the sponsors page template.', 'wordcamporg'); ?>
-                               </div>
-                               <ul class="sponsor-order">
-                               <?php foreach( $levels as $term ): ?>
-                                       <li class="level">
-                                               <input type="hidden" class="level-id" name="<?php echo esc_attr( $this->get_name() ); ?>[]" value="<?php echo esc_attr( $term->term_id ); ?>" />
-                                               <?php echo esc_html( $term->name ); ?>
-                                       </li>
-                               <?php endforeach; ?>
-                               </ul>
-                               <p class="submit">
-                                       <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcamporg' ); ?>" />
-                               </p>
-                       </form>
-               </div>
-               <?php
-       }
-
-       function get_levels() {
-               $option         = get_option( $this->get_name() );
-               $term_objects   = get_terms( WCB_SPONSOR_LEVEL_TAXONOMY, array('get' => 'all') );
-               $terms          = array();
-               $ordered_terms  = array();
-
-               foreach ( $term_objects as $term ) {
-                       $terms[ $term->term_id ] = $term;
-               }
-
-               if ( empty( $option ) )
-                       $option = array();
-
-               foreach ( $option as $term_id ) {
-                       if ( isset( $terms[ $term_id ] ) ) {
-                               $ordered_terms[] = $terms[ $term_id ];
-                               unset( $terms[ $term_id ] );
-                       }
-               }
-
-               return array_merge( $ordered_terms, array_values( $terms ) );
-       }
-
-       function get_option( $option, $name ) {
-               if ( 'sponsor_level_order' == $name )
-                       return $this->get_levels();
-               else
-                       return $option;
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsortemplatephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-template.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-template.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,81 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * wcb_sponsor_query()
- *
- * Creates and fetches the sponsor query.
- *
- * @return WP_Query The sponsor query.
- */
-function wcb_sponsor_query( $args=array() ) {
-       global $wcb_sponsor_query;
-
-       if ( empty( $args ) && isset( $wcb_sponsor_query ) )
-               return $wcb_sponsor_query;
-
-       $defaults = array(
-               'post_type'         => WCB_SPONSOR_POST_TYPE,
-               'order'             => 'ASC',
-               'posts_per_page'    => -1,
-       );
-       $args = wp_parse_args( $args, $defaults );
-
-       $wcb_sponsor_query = new WP_Query( $args );
-
-       return $wcb_sponsor_query;
-}
-
-/**
- * wcb_have_sponsors()
- *
- * Whether there are more sponsors available in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_have_sponsors() {
-       $query = wcb_sponsor_query();
-       return $query->have_posts();
-}
-
-/**
- * wcb_rewind_sponsors()
- *
- * Rewind the sponsors loop.
- */
-function wcb_rewind_sponsors() {
-       $query = wcb_sponsor_query();
-       return $query->rewind_posts();
-}
-
-/**
- * wcb_the_sponsor()
- *
- * Loads up the current sponsor in the loop.
- *
- * @return object WordCamp information
- */
-function wcb_the_sponsor() {
-       $query = wcb_sponsor_query();
-       return $query->the_post();
-}
-
-/**
- * wcb_sponsor_level_class()
- *
- * Prints the sponsor level class attribute.
- */
-function wcb_sponsor_level_class( $term, $classes='' ) {
-       echo ' class="' . esc_attr( wcb_get_sponsor_level_class( $term, $classes ) ) . '" ';
-}
-       /**
-        * wcb_get_sponsor_level_class()
-        *
-        * Returns the sponsor level classes.
-        *
-        * @return string Sponsor level classes.
-        */
-       function wcb_get_sponsor_level_class( $term, $classes='' ) {
-               return "sponsor-level $term->slug $classes";
-       }
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsorsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsors.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsors.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,117 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Sponsors extends WCB_Loader {
-       var $meta_manager;
-
-       function constants() {
-               wcb_maybe_define( 'WCB_SPONSOR_POST_TYPE',      'wcb_sponsor',       'wcb_sponsor_post_type'      );
-               wcb_maybe_define( 'WCB_SPONSOR_SLUG',           'sponsor',           'wcb_sponsor_slug'           );
-               wcb_maybe_define( 'WCB_SPONSOR_LEVEL_TAXONOMY', 'wcb_sponsor_level', 'wcb_sponsor_level_taxonomy' );
-               wcb_maybe_define( 'WCB_SPONSOR_LEVEL_SLUG',     'sponsor_level',     'wcb_sponsor_level_slug'     );
-       }
-
-       function includes() {
-               require_once "class-wcb-sponsor-template.php";
-               require_once "class-wcb-sponsor-order.php";
-               require_once "class-wcb-widget-sponsors.php";
-       }
-
-       function loaded() {
-               new WCB_Sponsor_Order;
-               register_widget('WCB_Widget_Sponsors');
-       }
-
-       function register_post_types() {
-               // Sponsor post type labels
-               $labels = array (
-                       'name'                  => __( 'Sponsors', 'wordcamporg' ),
-                       'singular_name'         => __( 'Sponsor', 'wordcamporg' ),
-                       'add_new'               => __( 'Add New', 'wordcamporg' ),
-                       'add_new_item'          => __( 'Create New Sponsor', 'wordcamporg' ),
-                       'edit'                  => __( 'Edit', 'wordcamporg' ),
-                       'edit_item'             => __( 'Edit Sponsor', 'wordcamporg' ),
-                       'new_item'              => __( 'New Sponsor', 'wordcamporg' ),
-                       'view'                  => __( 'View Sponsor', 'wordcamporg' ),
-                       'view_item'             => __( 'View Sponsor', 'wordcamporg' ),
-                       'search_items'          => __( 'Search Sponsors', 'wordcamporg' ),
-                       'not_found'             => __( 'No sponsors found', 'wordcamporg' ),
-                       'not_found_in_trash'    => __( 'No sponsors found in Trash', 'wordcamporg' ),
-                       'parent_item_colon'     => __( 'Parent Sponsor:', 'wordcamporg' )
-               );
-
-               // Sponsor post type rewrite
-               $rewrite = array (
-                       'slug'        => WCB_SPONSOR_SLUG,
-                       'with_front'  => false,
-               );
-
-               // Sponsor post type supports
-               $supports = array (
-                       'title',
-                       'editor',
-                       'revisions',
-                       'thumbnail',
-               );
-
-               $menu_icon = wcb_menu_icon( WCB_SPONSOR_POST_TYPE, WCB_URL . '/images/sponsors.png' );
-
-               // Register sponsor post type
-               register_post_type (
-                       WCB_SPONSOR_POST_TYPE,
-                       apply_filters( 'wcb_sponsor_register_post_type',
-                               array (
-                                       'labels'            => $labels,
-                                       'rewrite'           => $rewrite,
-                                       'supports'          => $supports,
-                                       'menu_position'     => 21,
-                                       'public'            => true,
-                                       'show_ui'           => true,
-                                       'can_export'        => true,
-                                       'capability_type'   => 'post',
-                                       'hierarchical'      => false,
-                                       'query_var'         => true,
-                                       'menu_icon'         => $menu_icon,
-                               )
-                       )
-               );
-       }
-
-       function register_taxonomies() {
-
-               // Labels
-               $labels = array (
-                       'name'              => __( 'Sponsor Levels', 'wordcamporg'),
-                       'singular_name'     => __( 'Sponsor Level', 'wordcamporg'),
-                       'search_items'      => __( 'Search Sponsor Levels', 'wordcamporg'),
-                       'popular_items'     => __( 'Popular Sponsor Levels', 'wordcamporg'),
-                       'all_items'         => __( 'All Sponsor Levels', 'wordcamporg'),
-                       'edit_item'         => __( 'Edit Sponsor Level', 'wordcamporg'),
-                       'update_item'       => __( 'Update Sponsor Level','wordcampbase'),
-                       'add_new_item'      => __( 'Add Sponsor Level', 'wordcamporg'),
-                       'new_item_name'     => __( 'New Sponsor Level', 'wordcamporg'),
-               );
-
-               // Rewrite
-               $rewrite = array (
-                       'slug' => WCB_SPONSOR_LEVEL_SLUG
-               );
-
-               // Register the taxonomy
-               register_taxonomy (
-                       WCB_SPONSOR_LEVEL_TAXONOMY,     // The tax ID
-                       WCB_SPONSOR_POST_TYPE,          // The post type ID
-                       apply_filters( 'wcb_sponsor_level_tax_register',
-                               array (
-                                       'labels'                => $labels,
-                                       'rewrite'               => $rewrite,
-                                       'query_var'             => 'sponsor_level',
-                                       'hierarchical'          => true,
-                                       'public'                => true,
-                                       'show_ui'               => true,
-                               )
-                       )
-               );
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbwidgetsponsorsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-widget-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-widget-sponsors.php        2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-widget-sponsors.php  2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,70 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( ! class_exists( 'WCB_Widget_Sponsors' ) ) :
-class WCB_Widget_Sponsors extends WP_Widget {
-
-       function __construct() {
-               $widget_ops = array(
-                       'classname' => 'wcb_widget_sponsors',
-                       'description' => __( 'Your WordCamp&#8217;s Sponsors', 'wordcamporg' ),
-               );
-               WP_Widget::__construct( 'wcb_sponsors', __('Sponsors', 'wordcamporg'), $widget_ops );
-       }
-
-       function widget( $args, $instance ) {
-               extract( $args );
-               $title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-
-               echo $before_widget;
-               if ( $title )
-                       echo $before_title . $title . $after_title;
-
-               // Fetch sponsors
-               $terms = wcb_get_option('sponsor_level_order');
-
-               foreach ( $terms as $term ):
-                       $sponsors = wcb_sponsor_query( array(
-                               'taxonomy' => $term->taxonomy,
-                               'term'     => $term->slug,
-                       ) );
-
-                       if ( ! wcb_have_sponsors() )
-                               continue;
-
-                       // Open sponsor level ?>
-                       <div <?php wcb_sponsor_level_class( $term ); ?>>
-                       <h4 class="sponsor-level-title"><?php echo esc_html( $term->name ); ?></h4><?php
-
-                       while ( wcb_have_sponsors() ):
-                               wcb_the_sponsor();
-                               ?><a class="sponsor-logo" href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
-                                       if ( has_post_thumbnail() )
-                                               the_post_thumbnail();
-                                       else
-                                               the_title();
-                               ?></a><?php
-                       endwhile;
-
-                       // Close sponsor level. ?>
-                       </div><?php
-               endforeach;
-
-               echo $after_widget;
-       }
-
-       function form( $instance ) {
-               $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-               $title = $instance['title'];
-?>
-               <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'wordcamporg'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
-<?php
-       }
-
-       function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
-               $instance['title'] = strip_tags($new_instance['title']);
-               return $instance;
-       }
-
-}
-endif; // class_exists
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorscssordercss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/css/order.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/css/order.css        2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/css/order.css  2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.sponsor-order-instructions{font-style:italic;margin:20px 0 0 20px;}.sponsor-order{margin:20px 20px 40px;width:300px;}.sponsor-order .level{padding:10px;cursor:move;font-weight:bold;text-shadow:0 1px 1px #fff;background-color:#eee;background-image:-moz-linear-gradient(top,rgba(255,255,255,0.2),rgba(0,0,0,0.1));background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(255,255,255,0.2)),to(rgba(0,0,0,0.1)));border:1px solid #ccc;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorscssorderdevcss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/css/order.dev.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/css/order.dev.css    2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/css/order.dev.css      2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,25 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.sponsor-order-instructions {
-       font-style: italic;
-       margin: 20px 0 0 20px;
-}
-.sponsor-order {
-       margin: 20px 20px 40px;
-       width: 300px;
-}
-
-.sponsor-order .level {
-       padding: 10px;
-       cursor: move;
-
-       font-weight: bold;
-       text-shadow: 0 1px 1px #fff;
-
-       background-color: #eee;
-       background-image: -moz-linear-gradient(top,  rgba(255,255,255,0.2),  rgba(0,0,0,0.1));
-       background-image: -webkit-gradient(linear, left top, left bottom, from( rgba(255,255,255,0.2) ), to( rgba(0,0,0,0.1) ));
-
-       border: 1px solid #ccc;
-       -webkit-border-radius:4px;
-       -moz-border-radius: 4px;
-       border-radius:4px;
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsjsorderdevjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/js/order.dev.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/js/order.dev.js      2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/js/order.dev.js        2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-jQuery( function($){
-       $('.sponsor-order').sortable();
-});
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsjsorderjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/js/order.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/js/order.js  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/js/order.js    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-jQuery(function(a){a(".sponsor-order").sortable()});
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbbodyphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-body.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-body.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-body.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Body extends WCB_Elements {
-       function before() {
-               echo '<body ';
-               body_class();
-               echo '>';
-       }
-
-       function after() {
-               echo '</body>';
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbcontainerphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-container.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-container.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-container.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,45 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Container extends WCB_Elements {
-       var $attrs;
-       var $tag;
-
-       function __construct( $args=array(), $elements=array() ) {
-               parent::__construct( $elements );
-
-               $defaults = array(
-                       'id' => '',
-                       'class' => '',
-                       'tag' => 'div'
-               );
-               $args = wp_parse_args( $args, $defaults );
-
-               $this->tag = $args['tag'];
-               unset( $args['tag'] );
-
-               $this->attrs = $args;
-       }
-
-       function esc_attrs( $attrs ) {
-               $html = '';
-               foreach ( $attrs as $k => $v ) {
-                       if ( ! empty( $k ) && ! empty( $v ) )
-                               $html .= ' ' . esc_html( $k ) . '="' . esc_attr( $v ) . '"';
-               }
-               return $html;
-       }
-
-       function before() {
-               echo '<' . esc_html( $this->tag ) . $this->esc_attrs( $this->attrs ) . '>';
-       }
-
-       function after() {
-               echo '</' . esc_html( $this->tag ) . '>';
-       }
-
-       function get_id() {
-               return $this->attrs['id'];
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbcontentphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-content.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-content.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,32 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Content extends WCB_Container {
-       var $open = false;
-
-       function __construct( $args ) {
-               // $args = wp_parse_args( $args, array( 'id' => 'main' ) );
-               parent::__construct( $args );
-       }
-
-       function before() {
-               parent::before();
-               echo '<div id="main">';
-       }
-
-       function after() {
-               echo '</div>';
-               parent::after();
-       }
-
-       function render() {
-               if ( ! $this->open ) {
-                       $this->open = true;
-                       $this->before();
-                       return false;
-               }
-               $this->open = false;
-               $this->after();
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbelementphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-element.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-element.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-element.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,19 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Element {
-       function render() {
-               $this->before();
-               $this->content();
-               $this->after();
-       }
-
-       function before() {}
-       function content() {}
-       function after() {}
-
-       function get_id() {
-               return '';
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbelementsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-elements.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-elements.php      2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-elements.php        2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,69 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Elements extends WCB_Element {
-       var $elements = array();
-       var $_queue = array();
-
-       function __construct( $elements=array() ) {
-               $this->add( $elements );
-       }
-
-       function add( $elements ) {
-               if ( ! is_array( $elements ) )
-                       $elements = array( $elements );
-               $this->elements = array_merge( $this->elements, $elements );
-       }
-
-       function reset() {
-               $this->_queue = array();
-       }
-
-       /**
-        * Renders the elements.
-        * Elements can stop the queue by returning false in their render method.
-        * If the queue has been stopped, render() will resume from the stopping point.
-        *
-        * @param boolean $resume_only If true, will only render if the queue has already been stopped.
-        */
-       function render( $resume_only=false ) {
-               if ( ! $this->in_progress() ) {
-
-                       if ( $resume_only )
-                               return;
-
-                       $this->_queue = $this->elements;
-                       $this->before();
-               }
-
-               $this->content();
-
-               if ( ! $this->in_progress() )   // Finish the collection.
-                       $this->after();
-               else                            // We encountered a break.
-                       return false;
-       }
-
-       /**
-        * Determine whether a render is in progress or stopped.
-        */
-       function in_progress() {
-               return ! empty( $this->_queue );
-       }
-
-       /**
-        * Resumes rendering a stopped queue.
-        */
-       function resume() {
-               $this->render( true );
-       }
-
-       function content() {
-               while ( $this->in_progress() ) {
-                       if ( $this->_queue[0]->render() === false )
-                               break;
-                       array_shift( $this->_queue );
-               }
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbfooterphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-footer.php        2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-footer.php  2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,36 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Footer extends WCB_Element {
-       function get_id() {
-               return 'footer';
-       }
-
-       function content() { ?>
-               <div class="grid_12">
-               <div id="<?php echo $this->get_id(); ?>" role="contentinfo">
-                       <div id="colophon">
-                               <div id="site-info">
-                                       <a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
-                                               <?php bloginfo( 'name' ); ?>
-                                       </a>
-                               </div><!-- #site-info -->
-
-                               <div id="site-generator">
-                                       <?php do_action( 'twentyten_credits' ); ?>
-                                       <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'wordcamporg' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'wordcamporg' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s.', 'wordcamporg' ), 'WordPress' ); ?></a>
-                               </div><!-- #site-generator -->
-
-                       </div><!-- #colophon -->
-               </div><!-- #footer -->
-               </div>
-               <?php
-                       /* Always have wp_footer() just before the closing </body>
-                        * tag of your theme, or you will break many plugins, which
-                        * generally use this hook to reference JavaScript files.
-                        */
-
-                       wp_footer();
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbheaderphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-header.php        2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-header.php  2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,32 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Header extends WCB_Element {
-       function get_id() {
-               return 'header';
-       }
-
-       function content() { ?>
-               <div id="<?php echo $this->get_id(); ?>" class="grid_12">
-                       <div id="return-to-central">
-<?php if ( false !== strpos($_SERVER['HTTP_HOST'], 'wordpress.org')) { ?>
-                               <a href="http://wordpress.org/" title="<?php esc_attr_e( 'Return to WordPress.org', 'wordcamporg' ); ?>"><?php _e('&larr; WordPress.org', 'wordcamporg'); ?></a>
-<?php } else { ?>
-                               <a href="http://central.wordcamp.org/" title="<?php esc_attr_e( 'Return to WordCamp Central', 'wordcamporg' ); ?>"><?php _e('&larr; WordCamp Central', 'wordcamporg'); ?></a>
-<?php } ?>
-
-                       </div>
-                       <div id="masthead">
-                               <div id="branding" role="banner">
-                                       <div id="branding-overlay"></div>
-                                       <div id="branding-logo"></div>
-                                       <?php wcb_site_title(); ?>
-                                       <div id="site-description"><?php bloginfo( 'description' ); ?></div>
-                                       <?php wcb_header_image(); ?>
-                               </div><!-- #branding -->
-                       </div><!-- #masthead -->
-               </div><!-- #header -->
-       <?php
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbmenuphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-menu.php  2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-menu.php    2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,30 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Menu extends WCB_Element {
-       function get_id() {
-               return 'main-menu';
-       }
-
-       function content() { ?>
-               <div id="<?php echo $this->get_id(); ?>" class="grid_12">
-                       <div id="access" role="navigation" class="clearfix">
-                               <?php /*  Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
-                               <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'wordcamporg' ); ?>"><?php _e( 'Skip to content', 'wordcamporg' ); ?></a></div>
-                               <?php /* Our navigation menu.  If one isn't filled out, wp_nav_menu falls back to wp_page_menu.  The menu assiged to the primary position is the one used.  If none is assigned, the menu with the lowest ID is used.  */ ?>
-                               <?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
-
-                               <?php
-                               $option = wcb_get_option('featured_button');
-                               if ( $option['visible'] ): ?>
-                                       <a href="<?php echo esc_url( $option['url'] ); ?>" class="button featured-button">
-                                               <?php echo esc_html( $option['text'] ); ?>
-                                       </a>
-                               <?php endif; ?>
-
-                       </div><!-- #access -->
-               </div>
-       <?php
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbsidebarrowphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-sidebar-row.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-sidebar-row.php   2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-sidebar-row.php     2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,59 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Sidebar_Row extends WCB_Container {
-       function __construct( $args ) {
-               $defaults = array(
-                       'id'    => '',
-                       'class' => '',
-                       'name'  => '',
-                       'grid'  => array(),
-                       'width' => 12
-               );
-               extract( wp_parse_args( $args, $defaults ) );
-
-               if ( empty( $id ) || empty( $name ) || empty( $grid ) )
-                       return;
-
-               parent::__construct( array(
-                       'id' => $id,
-                       'class' => "grid_$width sidebar-row $class",
-               ) );
-
-               $sidebar_index = 1;
-               foreach ( $grid as $index => $cell ) {
-
-                       if ( is_numeric( $cell ) ) {
-                               $cols = $cell;
-                               $type = 'sidebar';
-                       } else {
-                               list( $cols, $type ) = $cell;
-                       }
-
-                       $class = "grid_$cols sidebar-cell $id";
-
-                       if ( $index == 0 )
-                               $class .= " alpha";
-                       if ( $index == count( $grid ) - 1 )
-                               $class .= " omega";
-
-                       switch ( $type ) {
-                               case 'sidebar':
-                                       $sidebar_name = count( $grid ) == 1 ? $name : "$name $sidebar_index";
-                                       $this->add( new WCB_Sidebar( array(
-                                               'id'    => "$id-$sidebar_index",
-                                               'name'  => $sidebar_name,
-                                               'class' => $class
-                                       ) ) );
-                                       $sidebar_index++;
-                                       break;
-                               case 'content':
-                                       $this->add( new WCB_Content( array(
-                                               'class' => $class
-                                       ) ) );
-                                       break;
-                       }
-               }
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbsidebarphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-sidebar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-sidebar.php       2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-sidebar.php 2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,50 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Sidebar extends WCB_Element {
-       var $id;
-       var $args;
-       
-       function __construct( $args ) {
-               $defaults = array(
-                       'class'             => '',
-                       // id, name, description left to their register_sidebar defaults.
-                       'before_widget'     => '<li id="%1$s" class="widget-container %2$s">',
-                       'after_widget'      => '</li>',
-                       'before_title'      => '<h3 class="widget-title">',
-                       'after_title'       => '</h3>',
-               );
-               
-               $this->args = wp_parse_args( $args, $defaults );
-               
-               add_action( 'widgets_init', array( &$this, 'register' ) );
-       }
-       
-       function register() {
-               $this->id = register_sidebar( $this->args );
-       }
-       
-       function render() {
-               if ( ! isset( $this->id ) || ! is_active_sidebar( $this->id ) )
-                       return;
-               
-               parent::render();
-       }
-       
-       function before() {
-               $id = esc_attr( $this->id );
-               $class = esc_attr( $this->args['class'] );
-               
-               echo "<div id='$id' class='widget-area $class' role='complementary'>";
-               echo '<ul class="xoxo">';
-       }
-       
-       function content() {
-               dynamic_sidebar( $this->id );
-       }
-       
-       function after() {
-               echo '</ul></div>';
-       }
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbstructurephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,186 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class WCB_Structure extends WCB_Loader {
-       var $body;
-       var $sidebars;
-       var $excerpting = false;
-
-       function includes() {
-               // Require all elements
-               $elements = array('element', 'elements', 'container', 'sidebar', 'sidebar-row', 'content', 'header', 'footer', 'menu', 'body');
-               foreach ( $elements as $element ) {
-                       require_once "class-wcb-$element.php";
-               }
-       }
-
-       function hooks() {
-               add_action( 'after_setup_theme',    array( &$this, 'setup' ) );
-               add_action( 'template_redirect',    array( &$this, 'enqueue_styles' ) );
-               add_action( 'wp_head',              array( &$this, 'structure' ) );
-
-               // add_filter( 'the_content',          array( &$this, 'home_excerpts' ), 5 );
-       }
-
-       function setup() {
-               // Clear twenty ten's default widgets.
-               remove_action( 'widgets_init', 'twentyten_widgets_init' );
-
-               $this->register_sidebars();
-       }
-
-       function enqueue_styles() {
-               if ( is_admin() )
-                       return;
-
-               // The user chooses a grid.
-               $versions = array(
-                       'grid960' => '20110221',
-                       'grid720' => '20110221',
-               );
-
-               $grid  = wcb_get_option('grid');
-
-               // Don't output CSS if Jetpack Custom CSS/RemoteCSS is set to 'replace' mode
-               require_once( JETPACK__PLUGIN_DIR . '/modules/custom-css/custom-css-4.7.php' );
-               if ( Jetpack_Custom_CSS_Enhancements::skip_stylesheet() ) {
-                       return;
-               }
-
-               // todo - this filter is not used anywhere and can be removed. Custom CSS and Remote CSS have options for this instead.
-               $start_fresh = apply_filters( 'wcb_start_fresh', false );
-               $child_recs  = array();
-
-               if ( ! $start_fresh ) {
-                       wp_enqueue_style( 'wcb-foundation', WCB_URL . '/style.css', array(), '20110212' );
-                       $version = isset( $versions[ $grid ] ) ? $versions[ $grid ] : false;
-                       wp_enqueue_style( "wcb-$grid", wcb_dev_url( WCB_URL . "/css/$grid.css" ), array('wcb-foundation'), $version );
-                       wp_enqueue_style( "wcb-style", wcb_dev_url( WCB_URL . '/css/default.css' ), array('wcb-foundation', "wcb-$grid"), '20110421' );
-
-                       $child_recs = array('wcb-foundation', "wcb-$grid", 'wcb-style');
-               }
-
-               if ( is_child_theme() ) {
-                       $child_version = apply_filters( 'wcb_child_css_version', false );
-                       wp_enqueue_style( "wcb-child", get_stylesheet_uri(), $child_recs, $child_version );
-               }
-       }
-
-       function register_sidebars() {
-               $this->sidebars = array();
-               $sidebar_args = array(
-                       'after_header'      => array(
-                               'id'   => 'after-header',
-                               'name' => __('After Header', 'wordcamporg'),
-                       ),
-                       'before_content'    => array(
-                               'id'   => 'before-content',
-                               'name' => __('Before Content', 'wordcamporg'),
-                       ),
-                       'content'           => array(
-                               'id'   => 'content-row',
-                               'name' => __('Content', 'wordcamporg'),
-                       ),
-                       'after_content'     => array(
-                               'id'   => 'after-content',
-                               'name' => __('After Content', 'wordcamporg'),
-                       ),
-                       'before_footer'     => array(
-                               'id'   => 'before-footer',
-                               'name' => __('Before Footer', 'wordcamporg'),
-                       ),
-               );
-
-               foreach ( $sidebar_args as $id => $args ) {
-                       $option = wcb_get_option( $id );
-
-                       if ( ! $option['visible'] )
-                               continue;
-
-                       $args['grid'] = $option['layout'];
-
-                       if ( $option['front_only'] )
-                               $args['name'] = sprintf( __('Front Page: %s', 'wordcamporg'), $args['name'] );
-
-                       $this->sidebars[ $id ] = new WCB_Sidebar_Row( $args );
-               }
-       }
-
-       function full_width_content() {
-               $this->sidebars['content'] = new WCB_Sidebar_Row( array(
-                       'id'   => 'content-row',
-                       'name' => __('Content', 'wordcamporg'),
-                       'grid' => array( array( 12, 'content' ) ),
-               ) );
-       }
-
-       function structure() {
-               $rows = array( new WCB_Header(), new WCB_Menu() );
-               $keys = array( 'after_header', 'before_content', 'content', 'after_content', 'before_footer' );
-
-               foreach ( $keys as $id ) {
-                       if ( ! isset( $this->sidebars[ $id ] ) )
-                               continue;
-
-                       $option = wcb_get_option( $id );
-
-                       if ( ! $option['front_only'] || is_front_page() )
-                               $rows[] = $this->sidebars[ $id ];
-               }
-
-               $rows[] = new WCB_Footer();
-
-               $this->row_structure( $rows );
-       }
-
-       // @TODO: Potentially remove this function and use only row_structure?
-       function column_structure( $rows ) {
-               $this->body = new WCB_Body( new WCB_Container( array(
-                       'id'    => 'wrapper',
-                       'class' => 'container_12 hfeed',
-               ), $rows ) );
-       }
-
-       function row_structure( $rows ) {
-               $this->body = new WCB_Body();
-
-               foreach ( $rows as $row ) {
-                       $id = $row->get_id();
-                       $container = new WCB_Container( array(
-                               'id'    => "$id-container",
-                               'class' => 'container_12 hfeed clearfix',
-                       ), array( $row ) );
-
-                       $wrapper = new WCB_Container( array(
-                               'id'    => "$id-wrapper",
-                               'class' => 'row-wrapper',
-                       ), array( $container ) );
-
-                       $this->body->add( $wrapper );
-               }
-       }
-
-       /**
-        * Replace the content with an excerpt on the home page.
-        */
-       function home_excerpts( $content ) {
-               if ( ! is_front_page() || $this->excerpting )
-                       return $content;
-
-               $this->excerpting = true;
-               $content = get_the_excerpt();
-               $this->excerpting = false;
-               return $content;
-       }
-}
-
-function wcb_start_rendering() {
-       $structure = wcb_get('structure');
-       $structure->body->render();
-}
-
-function wcb_finish_rendering() {
-       $structure = wcb_get('structure');
-       $structure->body->resume();
-}
-
-?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilsheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/header.php      2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/header.php        2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,22 +77,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">- * Print the typekit script tags.
- */
-function wcb_typekit_scripts() {
-       $option = wcb_get_option( 'typekit' );
-       $kit_id = apply_filters( 'wcb_typekit_id', $option );
-
-       if ( empty( $kit_id ) )
-               return;
-
-       ?>
-       <script type="text/javascript" src="//use.typekit.com/<?php echo esc_attr( $kit_id ); ?>.js"></script>
-       <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-       <?php
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px">  * Get the value for the <meta name="viewport"> tag
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @return string
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatesessionsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sessions.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sessions.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,49 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * @deprecated (template name was Sessions)
- *
- * This is the template that displays all pages by default.
- * Please note that this is the WordPress construct of pages
- * and that other 'pages' on your WordPress site will use a
- * different template.
- *
- * @package WCBS
- * @since WCBS 1.0
- */
-$sessions = wcb_session_query();
-get_header(); ?>
-
-               <div id="primary" class="site-content">
-                       <div id="content" role="main">
-
-                               <div class="callout lead"><?php
-                               if ( have_posts() ):
-                                       the_post();
-                                       the_content();
-                               endif; ?>
-                               </div>
-
-                               <div class="cpt-loop sessions"><?php
-                               while ( wcb_have_sessions() ):
-                                       wcb_the_session();
-                                       ?>
-                                       <div id="post-<?php the_ID(); ?>" <?php post_class( 'session' ); ?>>
-                                               <h3 class="entry-title session-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
-                                               <div class="entry-meta session-speakers">
-                                                       <?php wcb_entry_meta(); ?>
-                                               </div>
-                                               <div class="entry-content session-description"><?php
-                                                       if ( has_post_thumbnail() )
-                                                               the_post_thumbnail();
-                                                       the_content(); ?>
-                                               </div>
-                                       </div>
-                                       <?php
-                               endwhile; ?>
-                               </div><!-- .cpt-loop -->
-
-                       </div><!-- #content -->
-               </div><!-- #primary .site-content -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatespeakersphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-speakers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-speakers.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-speakers.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,59 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * @deprecated (template name was Speakers)
- *
- * This is the template that displays all pages by default.
- * Please note that this is the WordPress construct of pages
- * and that other 'pages' on your WordPress site will use a
- * different template.
- *
- * @package WCBS
- * @since WCBS 1.0
- */
-$speakers = wcb_speaker_query();
-get_header(); ?>
-
-               <div id="primary" class="site-content">
-                       <div id="content" role="main">
-
-                               <div class="callout lead"><?php
-                               if ( have_posts() ):
-                                       the_post();
-                                       the_content();
-                               endif; ?>
-                               </div>
-
-                               <div class="cpt-loop speaker-gravatar-list clearfix"><?php
-                                       while ( wcb_have_speakers() ):
-                                               wcb_the_speaker();
-
-                                               $href  = '#' . esc_attr( wcb_get_speaker_slug() );
-                                               $title = esc_attr( get_the_title() );
-                                               echo "<a href='$href' title='$title'>";
-                                               echo wcb_get_speaker_gravatar( 48 );
-                                               echo '</a>';
-                                       endwhile;
-                                       wcb_rewind_speakers();
-                               ?></div>
-                               
-                               <div class="cpt-loop speakers"><?php
-                               while ( wcb_have_speakers() ):
-                                       wcb_the_speaker();
-                                       ?>
-                                       <div id="<?php echo esc_attr( wcb_get_speaker_slug() ); ?>" <?php post_class( 'speaker clearfix' ); ?>>
-                                               <h3 class="entry-title speaker-name"><?php the_title(); ?></h3>
-                                               <div class="entry-content speaker-bio"><?php
-                                                       echo wcb_get_speaker_gravatar( 102 );
-                                                       the_content(); ?>
-                                               </div>
-                                       </div>
-                                       <?php
-                               endwhile;
-                               ?>
-                               </div><!-- .cpt-loop -->
-
-                       </div><!-- #content -->
-               </div><!-- #primary .site-content -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatesponsorsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sponsors.php     2017-09-08 19:02:08 UTC (rev 5899)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sponsors.php       2017-09-08 19:02:15 UTC (rev 5900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,72 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * @deprecated (template name was Sponsors)
- *
- * This is the template that displays all pages by default.
- * Please note that this is the WordPress construct of pages
- * and that other 'pages' on your WordPress site will use a
- * different template.
- *
- * @package WCBS
- * @since WCBS 1.0
- */
-
-get_header(); ?>
-
-               <div id="primary" class="site-content">
-                       <div id="content" role="main">
-
-                               <div class="sponsor-intro"><?php
-                               if ( have_posts() ):
-                                       the_post(); ?>
-                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                               <h1 class="entry-title"><?php the_title(); ?></h1>
-                                               <div class="entry-content"><?php the_content(); ?></div>
-                                       </div>
-                               <?php endif; ?>
-                               </div>
-
-                               <div class="sponsors"><?php
-
-                               $terms = wcb_get_option('sponsor_level_order');
-
-                               foreach ( $terms as $term ):
-                                       $sponsors = wcb_sponsor_query( array(
-                                               'taxonomy' => $term->taxonomy,
-                                               'term'     => $term->slug,
-                                       ) );
-
-                                       if ( ! wcb_have_sponsors() )
-                                               continue;
-
-                                       // Open sponsor level ?>
-                                       <div <?php wcb_sponsor_level_class( $term ); ?>>
-                                       <h2 class="sponsor-level-title"><?php echo esc_html( $term->name ); ?></h2><?php
-
-                                       while ( wcb_have_sponsors() ):
-                                               wcb_the_sponsor();
-                                               ?>
-                                               <div id="post-<?php the_ID(); ?>" <?php post_class( 'sponsor' ); ?>>
-                                                       <h3 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
-                                                               if ( has_post_thumbnail() )
-                                                                       the_post_thumbnail();
-                                                               else
-                                                                       the_title();
-                                                       ?></a></h3>
-                                                       <div class="entry-content sponsor-description"><?php
-                                                               the_content(); ?>
-                                                       </div>
-                                               </div>
-                                               <?php
-                                       endwhile;
-
-                                       // Close sponsor level. ?>
-                                       </div><?php
-                               endforeach; ?>
-                               </div>                            
-
-                       </div><!-- #content -->
-               </div><!-- #primary .site-content -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>