<!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>[192901] trunk/Websites/webkit.org</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">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192901">192901</a></dd>
<dt>Author</dt> <dd>jond@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 12:53:04 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed static reference PHP syntax for compatibility with the server environment.
* wp-content/plugins/table-of-contents.php:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsiteswebkitorgChangeLog">trunk/Websites/webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsiteswebkitorgwpcontentpluginstableofcontentsphp">trunk/Websites/webkit.org/wp-content/plugins/table-of-contents.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsiteswebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/ChangeLog (192900 => 192901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/ChangeLog 2015-12-01 20:26:05 UTC (rev 192900)
+++ trunk/Websites/webkit.org/ChangeLog 2015-12-01 20:53:04 UTC (rev 192901)
</span><span class="lines">@@ -1,5 +1,11 @@
</span><span class="cx"> 2015-12-01 Jonathan Davis <jond@apple.com>
</span><span class="cx">
</span><ins>+ Fixed static reference PHP syntax for compatibility with the server environment.
+
+ * wp-content/plugins/table-of-contents.php:
+
+2015-12-01 Jonathan Davis <jond@apple.com>
+
</ins><span class="cx"> Fixed PHP syntax for compatibility with the server environment.
</span><span class="cx">
</span><span class="cx"> * wp-content/plugins/social-meta.php:
</span></span></pre></div>
<a id="trunkWebsiteswebkitorgwpcontentpluginstableofcontentsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/wp-content/plugins/table-of-contents.php (192900 => 192901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/wp-content/plugins/table-of-contents.php 2015-12-01 20:26:05 UTC (rev 192900)
+++ trunk/Websites/webkit.org/wp-content/plugins/table-of-contents.php 2015-12-01 20:53:04 UTC (rev 192901)
</span><span class="lines">@@ -10,35 +10,37 @@
</span><span class="cx"> WebKitTableOfContents::init();
</span><span class="cx">
</span><span class="cx"> class WebKitTableOfContents {
</span><del>-
</del><ins>+
</ins><span class="cx"> private static $editing = false;
</span><span class="cx"> private static $toc = array();
</span><span class="cx"> private static $attr_regex = '\{((?:[ ]*[#.][-_:a-zA-Z0-9]+){1,})[ ]*\}';
</span><del>-
</del><ins>+
</ins><span class="cx"> public function init() {
</span><span class="cx"> add_filter( 'wp_insert_post_data', array( 'WebKitTableOfContents', 'wp_insert_post_data' ), 20, 2 );
</span><span class="cx"> add_action( 'wp_insert_post', array( 'WebKitTableOfContents', 'wp_insert_post' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public function hasIndex() {
</del><ins>+ public static function hasIndex() {
</ins><span class="cx"> $toc = get_post_meta( get_the_ID(), 'toc', true );
</span><del>- array_walk($toc, function ( $value, $key ) {
- list($level, $anchor) = explode('::', $key);
- if ( $level < 4 ) self::$toc[ $key ] = $value;
- });
</del><ins>+ array_walk($toc, array('WebKitTableOfContents', 'filterIndex'));
</ins><span class="cx"> return ( ! empty(self::$toc) && count(self::$toc) > 2 );
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ public static function filterIndex($value, $key) {
+ list($level, $anchor) = explode('::', $key);
+ if ( $level < 4 ) self::$toc[ $key ] = $value;
+ }
+
</ins><span class="cx"> public static function renderMarkup() {
</span><span class="cx"> if ( ! is_page() ) return;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty(self::$toc) || ! self::hasIndex() )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> $depth = 0;
</span><span class="cx"> $parent = 0;
</span><span class="cx"> $markup = '<input type="checkbox" id="table-of-contents-toggle" class="menu-toggle"><menu class="table-of-contents"><menuitem class="list"><h6><label for="table-of-contents-toggle">Contents</label></h6>';
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( self::$toc as $name => $heading ) {
</span><span class="cx"> list($level, $anchor) = explode('::', $name);
</span><span class="cx"> if ( empty($level) || $level > 3 ) continue;
</span><span class="lines">@@ -48,65 +50,65 @@
</span><span class="cx"> $depth = $level;
</span><span class="cx"> } elseif ( $level == $depth )
</span><span class="cx"> $markup .= '</li>';
</span><del>-
</del><span class="cx">
</span><del>-
</del><ins>+
+
</ins><span class="cx"> if ( $level > $depth ) {
</span><span class="cx"> $markup .= '<ul class="level-' . $level . '">';
</span><del>- $depth = $level;
</del><ins>+ $depth = $level;
</ins><span class="cx"> $parent = $depth;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $markup .= sprintf('<li><a href="#%s">%s</a>', $anchor, $heading);
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> $markup .= '</ul></menuitem></menu>';
</span><span class="cx">
</span><span class="cx"> return $markup;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> public static function markup() {
</span><span class="cx"> echo self::renderMarkup();
</span><span class="cx"> }
</span><del>-
- public function wp_insert_post_data( $post_data, $record ) {
-
</del><ins>+
+ public function wp_insert_post_data( $post_data, $record ) {
+
</ins><span class="cx"> if ( ! in_array($post_data['post_type'], array('page')) )
</span><span class="cx"> return $post_data;
</span><del>-
</del><ins>+
</ins><span class="cx"> $post_data['post_content'] = self::parse($post_data['post_content']);
</span><del>-
</del><ins>+
</ins><span class="cx"> self::$editing = isset( $record['ID'] ) ? $record['ID'] : false;
</span><del>-
</del><ins>+
</ins><span class="cx"> return $post_data;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> public static function wp_insert_post( $post_id ) {
</span><span class="cx"> if ( empty(self::$toc) ) return;
</span><span class="cx"> if ( self::$editing && self::$editing != $post_id ) return;
</span><del>- update_post_meta($post_id, 'toc', self::$toc);
</del><ins>+ update_post_meta($post_id, 'toc', self::$toc);
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> public static function parse( $content ) {
</span><span class="cx"> $markup = preg_replace_callback('{
</span><span class="cx"> ^<h([1-6])[^>]*>(.+?)<\/h[1-6]>* # HTML tags
</span><span class="cx"> |
</span><del>- ^(\#{1,6}) # $1 = string of #\'s
- [ ]*
- (.+?) # $2 = Header text
- [ ]*
- \#* # optional closing #\'s (not counted)
- (?:[ ]+ ' . self::$attr_regex . ' )? # $3 = id/class attributes
- [ ]*
- \n+
- }xm',
</del><ins>+ ^(\#{1,6}) # $1 = string of #\'s
+ [ ]*
+ (.+?) # $2 = Header text
+ [ ]*
+ \#* # optional closing #\'s (not counted)
+ (?:[ ]+ ' . self::$attr_regex . ' )? # $3 = id/class attributes
+ [ ]*
+ \n+
+ }xm',
</ins><span class="cx"> array('WebKitTableOfContents', 'index'),
</span><span class="cx"> $content
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $markup;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> public static function index( $matches ) {
</span><span class="cx"> list($marked, $level, $heading) = $matches;
</span><span class="cx"> $anchor = sanitize_title_with_dashes($heading);
</span></span></pre>
</div>
</div>
</body>
</html>