<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15068] trunk: Default Google Gears ignoreQuery to true in manifest.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15068">15068</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-05-30 08:45:50 +0000 (Sun, 30 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Default Google Gears ignoreQuery to true in manifest. see <a href="http://trac.wordpress.org/ticket/13562">#13562</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmingearsmanifestphp">trunk/wp-admin/gears-manifest.php</a></li>
<li><a href="#trunkwpadminincludesmanifestphp">trunk/wp-admin/includes/manifest.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmingearsmanifestphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/gears-manifest.php (15067 => 15068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/gears-manifest.php 2010-05-29 21:58:14 UTC (rev 15067)
+++ trunk/wp-admin/gears-manifest.php 2010-05-30 08:45:50 UTC (rev 15068)
</span><span class="lines">@@ -34,15 +34,15 @@
</span><span class="cx"> $entries = '';
</span><span class="cx">
</span><span class="cx"> foreach ( $files as $file ) {
</span><ins>+ // Set ignoreQuery, defaulting to true
+ $ignore_query = ( isset($file[2]) && !$file[2] ) ? '' : ', "ignoreQuery" : true ';
+
</ins><span class="cx"> // If version is not set, just output the file
</span><span class="cx"> if ( !isset($file[1]) )
</span><del>- $entries .= '{ "url" : "' . $file[0] . '" },' . "\n";
- // If ver is set but ignoreQuery is not, output file with ver tacked on
- elseif ( !isset($file[2]) )
- $entries .= '{ "url" : "' . $file[0] . '?' . $file[1] . '" },' . "\n";
- // Output url, src, and ignoreQuery
</del><ins>+ $entries .= '{ "url" : "' . $file[0] . '"' . $ignore_query . ' }' . "\n";
+ // Output url and src
</ins><span class="cx"> else
</span><del>- $entries .= '{ "url" : "' . $file[0] . '", "src" : "' . $file[0] . '?' . $file[1] . '", "ignoreQuery" : true },' . "\n";
</del><ins>+ $entries .= '{ "url" : "' . $file[0] . '", "src" : "' . $file[0] . '?' . $file[1] . '"' . $ignore_query . ' },' . "\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo trim( trim($entries), ',' );
</span></span></pre></div>
<a id="trunkwpadminincludesmanifestphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/manifest.php (15067 => 15068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/manifest.php 2010-05-29 21:58:14 UTC (rev 15067)
+++ trunk/wp-admin/includes/manifest.php 2010-05-30 08:45:50 UTC (rev 15068)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve list of all cacheable WP files
</span><span class="cx"> *
</span><del>- * Array format: file, version (optional), bool (whether to use src and set ignoreQuery)
</del><ins>+ * Array format: file, version (optional), bool (whether to use src and set ignoreQuery, defaults to true)
</ins><span class="cx"> */
</span><span class="cx"> function &get_manifest() {
</span><span class="cx"> global $mce_ver;
</span><span class="lines">@@ -89,70 +89,70 @@
</span><span class="cx">
</span><span class="cx"> if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) :
</span><span class="cx"> $mce = array(
</span><del>- array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/utils/validate.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/utils/form_utils.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/utils/editable_selects.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/tiny_mce_popup.js', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver),
+ array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver),
+ array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver),
+ array('../wp-includes/js/tinymce/utils/validate.js', $mce_ver),
+ array('../wp-includes/js/tinymce/utils/form_utils.js', $mce_ver),
+ array('../wp-includes/js/tinymce/utils/editable_selects.js', $mce_ver),
+ array('../wp-includes/js/tinymce/tiny_mce_popup.js', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/themes/advanced/editor_template.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/source_editor.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/anchor.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/image.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/link.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/color_picker.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/charmap.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/charmap.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/image.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/link.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/anchor.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/themes/advanced/editor_template.js', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/source_editor.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/anchor.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/image.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/link.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/color_picker.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/charmap.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/js/charmap.js', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/js/image.js', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/js/link.js', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/js/anchor.js', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/media/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/media/js/media.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/media/media.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/media/css/content.css', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/media/css/media.css', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/media/editor_plugin.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/media/js/media.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/media/media.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/media/css/content.css', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/media/css/media.css', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/pasteword.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/blank.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/pastetext.htm', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/paste/pasteword.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/paste/blank.htm', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/paste/pastetext.htm', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wordpress/css/content.css', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/wordpress/css/content.css', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver),
</ins><span class="cx">
</span><del>- array('../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver, true),
</del><ins>+ array('../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver),
</ins><span class="cx">
</span><span class="cx"> array('../wp-includes/js/tinymce/themes/advanced/img/icons.gif'),
</span><span class="cx"> array('../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg'),
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (15067 => 15068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2010-05-29 21:58:14 UTC (rev 15067)
+++ trunk/wp-includes/version.php 2010-05-30 08:45:50 UTC (rev 15068)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $manifest_version
</span><span class="cx"> */
</span><del>-$manifest_version = '20100520';
</del><ins>+$manifest_version = '20100530';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the required PHP version
</span></span></pre>
</div>
</div>
</body>
</html>