<!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>[1084] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes: WP.org Themes: Use global header and footer.</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/1084">1084</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/1084","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-05 17:24:12 +0000 (Mon, 05 Jan 2015)</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'>WP.org Themes: Use global header and footer.

See <a href="http://meta.trac.wordpress.org/ticket/745">#745</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesfooterphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/footer.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesheaderphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/header.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesfooterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/footer.php       2015-01-03 00:16:48 UTC (rev 1083)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/footer.php 2015-01-05 17:24:12 UTC (rev 1084)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,92 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * The template for displaying the footer.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Contains the closing of the #content div and all content after
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @package wporg-themes
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="wporg-footer">
-       <div class="wrapper">
-               <ul>
-                       <li><a href="//wordpress.org/about/" title="An introduction to the WordPress project">About</a></li>
-                       <li><a href="//wordpress.org/news/" title="News and Updates">Blog</a></li>
-                       <li><a href="//wordpress.org/hosting/" title="Recommended web hosting providers">Hosting</a></li>
-                       <li><a href="http://jobs.wordpress.net/" title="Find or post WordPress jobs">Jobs</a></li>
-               </ul>
-
-               <ul>
-                       <li><a href="//wordpress.org/support/" title="Forums, documentation, and other resources">Support</a></li>
-                                               <li><a href="//make.wordpress.org/" title="Give back to WordPress through code, support, translation and more">Get Involved</a></li>
-                       <li><a href="//learn.wordpress.org/" title="Workshops and training materials">Learn</a></li>
-               </ul>
-
-               <ul>
-                       <li><a href="//wordpress.org/showcase/" title="Some of the best WordPress sites on the Web">Showcase</a></li>
-                       <li><a href="//wordpress.org/plugins/" title="Add extra functionality to WordPress">Plugins</a></li>
-                       <li><a href="//wordpress.org/themes/" title="Make your WordPress pretty">Themes</a></li>
-                       <li><a href="//wordpress.org/ideas/" title="Share your ideas for improving WordPress">Ideas</a></li>
-               </ul>
-
-               <ul>
-                       <li><a href="http://central.wordcamp.org/" title="Find a WordPress event near you">WordCamp</a></li>
-                       <li><a href="http://wordpress.tv/" title="Videos, tutorials, and WordCamp sessions">WordPress.TV</a></li>
-                       <li><a href="//buddypress.org/" title="A set of plugins to transform your WordPress into a social network">BuddyPress</a></li>
-                       <li><a href="//bbpress.org/" title="Fast, slick forums built on WordPress">bbPress</a></li>
-               </ul>
-
-               <ul>
-                       <li><a href="http://wordpress.com/?ref=wporg-footer" title="Hassle-free WordPress hosting">WordPress.com</a></li>
-                       <li><a href="http://ma.tt/" title="Co-founder of WordPress, an example of what WordPress can do">Matt</a></li>
-                       <li><a href="//wordpress.org/about/privacy/" title="WordPress.org Privacy Policy">Privacy</a></li>
-                       <li><a href="//wordpress.org/about/license/" title="WordPress is open source software">License / GPLv2</a></li>
-               </ul>
-
-               <ul>
-                       <li>
-                               <iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name=WordPress&show_count=false" style="width:135px; height:20px;"></iframe>
-                       </li>
-                       <li>
-                               <iframe src="//www.facebook.com/plugins/like.php?app_id=121415197926116&amp;href=http%3A%2F%2Fwww.facebook.com%2Fwordpress&amp;send=false&amp;layout=button_count&amp;width=135&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=lucida+grande&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:135px; height:21px;" allowTransparency="true"></iframe>
-                       </li>
-               </ul>
-       </div>
-
-       <h6 class="aligncenter">Code is Poetry</h6>
-</div>
-
-
-<script type="text/javascript">
-  var _qevents = _qevents || [];
-  (function() {
-   var elem = document.createElement('script');
-   elem.src = (document.location.protocol == "https:" ? "https://secure" : "http://edge")
-               + ".quantserve.com/quant.js";
-   elem.async = true;
-   elem.type = "text/javascript";
-   var scpt = document.getElementsByTagName('script')[0];
-   scpt.parentNode.insertBefore(elem, scpt);
-  })();
-</script>
-<script type="text/javascript">_qevents.push( { qacct:"p-18-mFEk4J448M"} );</script>
-<noscript><img src="//pixel.quantserve.com/pixel/p-18-mFEk4J448M.gif" style="display: none;" border="0" height="1" width="1" alt=""/></noscript>
-<!--  -->
-<script type="text/javascript" src="//gravatar.com/js/gprofiles.js"></script>
-
-<script type="text/javascript">
-(function($){
-$(document).ready(function() {
-       $('#footer a').click(function() {
-               if (this.href.indexOf('wordpress.org') == -1 && this.href.indexOf('http') == 0) {
-                       recordOutboundLink(this, 'Outbound Links', this.href);
-                       return false;
-               }
-       });
-});
-})(jQuery);
-</script>
-
-<?php wp_footer(); ?>
-</body>
-</html>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require WPORGPATH . 'footer.php';
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php    2015-01-03 00:16:48 UTC (rev 1083)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php      2015-01-05 17:24:12 UTC (rev 1084)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,6 +109,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', 'wporg_themes_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Create a nicely formatted and more specific title element text for output
+ * in head of document, based on current view.
+ *
+ * @global int $paged WordPress archive pagination page count.
+ * @global int $page  WordPress paginated post page count.
+ *
+ * @param string $title Default title text for current view.
+ * @param string $sep Optional separator.
+ * @return string The filtered title.
+ */
+function wporg_themes_wp_title( $title, $sep ) {
+       global $paged, $page;
+
+       if ( is_feed() ) {
+               return $title;
+       }
+
+       // Add the site name.
+       $title .= get_bloginfo( 'name', 'display' );
+
+       // Add the site description for the home/front page.
+       $site_description = get_bloginfo( 'description', 'display' );
+       if ( $site_description && ( is_home() || is_front_page() ) ) {
+               $title = "$title $sep $site_description";
+       }
+
+       // Add a page number if necessary.
+       if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+               $title = "$title $sep " . sprintf( __( 'Page %s', 'wporg-themes' ), max( $paged, $page ) );
+       }
+
+       return $title;
+}
+add_filter( 'wp_title', 'wporg_themes_wp_title', 10, 2 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px">  * @param  object $args
</span><span class="cx" style="display: block; padding: 0 10px">  * @param  string $action
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/header.php       2015-01-03 00:16:48 UTC (rev 1083)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/header.php 2015-01-05 17:24:12 UTC (rev 1084)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,97 +2,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * The header for our theme.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Displays all of the <head> section and everything up till <div id="content">
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @package wporg-themes
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 
-// include 'http://wordpress.org/header.php'; // do the header change when not testing locally, all below is copy of header
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?><!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-US">
-<head profile="http://gmpg.org/xfn/11">
-<meta charset="utf-8" />
-<!--
-<meta property="fb:page_id" content="6427302910" />
--->
-<meta name="google-site-verification" content="7VWES_-rcHBcmaQis9mSYamPfNwE03f4vyTj4pfuAw0" />
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>WordPress &#8250; Free WordPress Themes</title>
-<link href="//s.w.org/wp-includes/css/dashicons.css?20140409" rel="stylesheet" type="text/css" />
-<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic' rel='stylesheet' type='text/css'>
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<link media="only screen and (max-device-width: 480px)" href="//s.w.org/style/iphone.css?1" type="text/css" rel="stylesheet" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$GLOBALS['pagetitle'] = wp_title( '&laquo;', false, 'right' );
+require WPORGPATH . 'header.php';
+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<link rel="shortcut icon" href="//s.w.org/favicon.ico" type="image/x-icon" />
-
-
-<!--[if lte IE 8]>
-<style type="text/css">
-@import url("//s.w.org/style/ie.css?1");
-</style>
-<![endif]-->
-
-<meta name="generator" content="bbPress 1.1" />
-<link rel='stylesheet' id='forum-wp4-css'  href='//s.w.org/style/forum-wp4.css?ver=11' type='text/css' media='' />
-<link rel='stylesheet' id='style-wp4-css'  href='//s.w.org/bb-theme/plugins/style-wp4.css?ver=19' type='text/css' media='' />
-<!--[if IE 7]>
-<link rel='stylesheet' id='forum-ie7-css'  href='//s.w.org/style/forum-ie7.css?ver=7' type='text/css' media='' />
-<![endif]-->
-       <link rel='stylesheet' href='https://wordpress.org/extend/themes-plugins/bb-ratings/bb-ratings.css?4' type='text/css' />
-<link rel="alternate" type="application/rss+xml" title="Free WordPress Themes &raquo; Recent Posts" href="https://wordpress.org/themes/rss/" />
-<link rel="alternate" type="application/rss+xml" title="Free WordPress Themes &raquo; Recent Topics" href="https://wordpress.org/themes/rss/topics" /><script type="text/javascript" src="//s.w.org/wp-includes/js/jquery/jquery.js?v=1.10.2"></script>
-<script>document.cookie='devicePixelRatio='+((window.devicePixelRatio === undefined) ? 1 : window.devicePixelRatio)+'; path=/';</script>
-<script type="text/javascript">
-var toggleMenu = function(){
-    var m = document.getElementById('wporg-header-menu'),
-        c = m.className;
-           m.className = c.match( ' active' ) ? c.replace( ' active', '' ) : c + ' active';
-}
-</script>
-<?php wp_head(); ?>
-</head>
-
-<body id="wordpress-org" <?php body_class(); ?>>
-<div id="wporg-header">
-       <div class="wrapper">
-               <a id="mobile-menu-button" class="" href="#" onclick="toggleMenu();"></a>
-               <h1><a href="//wordpress.org">WordPress.org</a></h1>
-               <div id="head-search">
-                       <form action="//wordpress.org/search/do-search.php" method="get">
-                               <input class="text" name="search" type="text" value="" maxlength="150" placeholder="Search WordPress.org" /> <input type="submit" class="button" value="" />
-                       </form>
-               </div>
-               <div style="clear:both"></div>
-
-<ul id="wporg-header-menu">
-<li><a href='//wordpress.org/showcase/' title='See some of the sites built on WordPress.'>Showcase</a></li>
-<li><a href='' title='Find just the right look for your website.' class="current">Themes</a><div class="uparrow"></div></li>
-<li><a href='//wordpress.org/plugins/' title='Plugins can extend WordPress to do almost anything you can imagine.'>Plugins</a></li>
-<li><a href='//wordpress.org/mobile/' title='Take your website on the go!'>Mobile</a></li>
-<li><a href='//wordpress.org/support/' title='Forums, documentation, help.'>Support</a><ul class="nav-submenu"><li><a href='//wordpress.org/support/' title='Support and discussion forums.'>Forums</a></li><li><a href='//codex.wordpress.org/Main_Page' title='Documentation, tutorials, best practices.'>Documentation</a></li></ul><div class="uparrow"></div></li>
-<li><a href='//make.wordpress.org/' title='Contribute your knowledge.'>Get Involved</a></li>
-<li><a href='//wordpress.org/about/' title='About the WordPress Organization, and where we&#039;re going.'>About</a></li>
-<li><a href='//wordpress.org/news/' title='Come here for the latest scoop.'>Blog</a></li>
-<li><a href='//wordpress.org/hosting/' title='Find a home for your blog.'>Hosting</a></li>
-<li id="download" class="button download-button"><a href='//wordpress.org/download/' title='Get it. Got it? Good.'>Download WordPress</a></li>
-</ul>
-               <div style="clear:both"></div>
-       </div>
-</div>
-
-<div id="download-mobile">
-       <div class="wrapper">
-               <span class="download-ready">Ready to get started?</span><a class="button download-button" href="//wordpress.org/download/" title="Get it. Got it? Good.">Download WordPress</a>
-       </div>
-</div>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <div id="headline">
</span><span class="cx" style="display: block; padding: 0 10px">        <div class="wrapper">
</span><span class="cx" style="display: block; padding: 0 10px">                <h2 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-               <p class="login">
-       Welcome, <a href='//profiles.wordpress.org/otto42'>Samuel Wood (Otto)</a>    | <a href="https://wordpress.org/themes/bb-admin/">Admin</a>     | <a href="https://wordpress.org/themes/bb-login.php?action=logout">Log Out</a></p>
-
</del><span class="cx" style="display: block; padding: 0 10px">         </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>

</body>
</html>