<!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>[19844] trunk/wp-content/themes/twentytwelve/functions.php: Freshen up the docs in functions.php.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19844">19844</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-02-06 23:04:56 +0000 (Mon, 06 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Freshen up the docs in functions.php. Remove is_admin() check from twentytwelve_enqueue_scripts(). Remove function_exists() wrappers from functions that are hooked in. Kill locale.php handling. see <a href="http://core.trac.wordpress.org/ticket/19978">#19978</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (19843 => 19844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-02-06 22:37:45 UTC (rev 19843)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-02-06 23:04:56 UTC (rev 19844)
</span><span class="lines">@@ -2,34 +2,38 @@
</span><span class="cx"> /**
</span><span class="cx"> * Twenty Twelve functions and definitions
</span><span class="cx"> *
</span><ins>+ * Sets up the theme and provides some helper functions. Some helper functions
+ * are used in the theme as custom template tags. Others are attached to action and
+ * filter hooks in WordPress to change core functionality.
+ *
+ * The first function, twentytwelve_setup(), sets up the theme by registering support
+ * for various features in WordPress, such as a custom background and a navigation menu.
+ *
+ * When using a child theme (see http://codex.wordpress.org/Theme_Development and
+ * http://codex.wordpress.org/Child_Themes), you can override certain functions
+ * (those wrapped in a function_exists() call) by defining them first in your child theme's
+ * functions.php file. The child theme's functions.php file is included before the parent
+ * theme's file, so the child theme functions would be used.
+ *
+ * Functions that are not pluggable (not wrapped in function_exists()) are instead attached
+ * to a filter or action hook.
+ *
+ * For more information on hooks, actions, and filters, see http://codex.wordpress.org/Plugin_API.
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Twelve
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// Set the content width based on the theme's design and stylesheet.
</del><ins>+/**
+ * Set the content width based on the theme's design and stylesheet.
+ */
</ins><span class="cx"> if ( ! isset( $content_width ) )
</span><span class="cx"> $content_width = 584;
</span><span class="cx">
</span><del>-add_action( 'wp_enqueue_scripts', 'twentytwelve_enqueue_scripts' );
-
-if ( ! function_exists( 'twentytwelve_enqueue_scripts' ) ) :
</del><span class="cx"> /**
</span><del>-* Add theme styles and scripts here
-*/
-function twentytwelve_enqueue_scripts() {
-
- if ( ! is_admin() ) {
- wp_enqueue_style(
- 'twentytwelve-style',
- get_bloginfo( 'stylesheet_url' )
- );
- }
-
-}
-endif; // twentytwelve_enqueue_scripts
-
-// Tell WordPress to run twentytwelve_setup() when the 'after_setup_theme' hook is run.
</del><ins>+ * Tell WordPress to run twentytwelve_setup() when the 'after_setup_theme' hook is run.
+ */
</ins><span class="cx"> add_action( 'after_setup_theme', 'twentytwelve_setup' );
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentytwelve_setup' ) ):
</span><span class="lines">@@ -52,11 +56,6 @@
</span><span class="cx"> */
</span><span class="cx"> load_theme_textdomain( 'twentytwelve', get_template_directory() . '/languages' );
</span><span class="cx">
</span><del>- $locale = get_locale();
- $locale_file = get_template_directory() . "/languages/$locale.php";
- if ( is_readable( $locale_file ) )
- require_once( $locale_file );
-
</del><span class="cx"> // Add default posts and comments RSS feed links to <head>.
</span><span class="cx"> add_theme_support( 'automatic-feed-links' );
</span><span class="cx">
</span><span class="lines">@@ -66,9 +65,26 @@
</span><span class="cx"> // Add support for custom backgrounds
</span><span class="cx"> add_custom_background();
</span><span class="cx"> }
</span><del>-endif; // twentytwelve_setup
</del><ins>+endif;
</ins><span class="cx">
</span><del>-// Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
</del><ins>+/**
+ * Enqueues the theme's stylesheet.
+ *
+ * The wp_enqueue_scripts hook is meant for both styles and scripts, and only
+ * fires on the frontend.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_enqueue_scripts() {
+ wp_enqueue_style( 'twentytwelve-style', get_bloginfo( 'stylesheet_url' ) );
+}
+add_action( 'wp_enqueue_scripts', 'twentytwelve_enqueue_scripts' );
+
+/**
+ * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
+ *
+ * @since Twenty Twelve 1.0
+ */
</ins><span class="cx"> function twentytwelve_page_menu_args( $args ) {
</span><span class="cx"> $args['show_home'] = true;
</span><span class="cx"> return $args;
</span><span class="lines">@@ -76,7 +92,7 @@
</span><span class="cx"> add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Register our sidebars and widgetized areas. Also register the default Epherma widget.
</del><ins>+ * Register our single widget area.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -93,7 +109,11 @@
</span><span class="cx"> add_action( 'widgets_init', 'twentytwelve_widgets_init' );
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
</span><del>-// Display navigation to next/previous pages when applicable
</del><ins>+/**
+ * Display navigation to next/previous pages when applicable
+ *
+ * @since Twenty Twelve 1.0
+ */
</ins><span class="cx"> function twentytwelve_content_nav( $nav_id ) {
</span><span class="cx"> global $wp_query;
</span><span class="cx">
</span><span class="lines">@@ -105,7 +125,7 @@
</span><span class="cx"> </nav><!-- #nav-above -->
</span><span class="cx"> <?php endif;
</span><span class="cx"> }
</span><del>-endif; // twentytwelve_content_nav
</del><ins>+endif;
</ins><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentytwelve_comment' ) ) :
</span><span class="cx"> /**
</span><span class="lines">@@ -160,7 +180,6 @@
</span><span class="cx"> <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></em>
</span><span class="cx"> <br />
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><span class="cx"> </footer>
</span><span class="cx">
</span><span class="cx"> <div class="comment-content"><?php comment_text(); ?></div>
</span><span class="lines">@@ -174,13 +193,14 @@
</span><span class="cx"> break;
</span><span class="cx"> endswitch;
</span><span class="cx"> }
</span><del>-endif; // ends check for twentytwelve_comment()
</del><ins>+endif;
</ins><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentytwelve_posted_on' ) ) :
</span><span class="cx"> /**
</span><span class="cx"> * Prints HTML with meta information for the current post-date/time and author.
</span><del>- * Create your own twentytwelve_posted_on to override in a child theme
</del><span class="cx"> *
</span><ins>+ * Create your own twentytwelve_posted_on() to override in a child theme.
+ *
</ins><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="cx"> function twentytwelve_posted_on() {
</span></span></pre>
</div>
</div>
</body>
</html>