<!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>[Tests][1148] trunk: Pinking shears and eol-style</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://unit-tests.trac.wordpress.org/changeset/1148">1148</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-21 15:01:28 +0000 (Wed, 21 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears and eol-style</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsadminincludesScreenphp">trunk/tests/admin/includesScreen.php</a></li>
<li><a href="#trunktestsajaxResponsephp">trunk/tests/ajax/Response.php</a></li>
<li><a href="#trunktestsattachmentslashesphp">trunk/tests/attachment/slashes.php</a></li>
<li><a href="#trunktestscanonicalpermalinkFormatsphp">trunk/tests/canonical/permalinkFormats.php</a></li>
<li><a href="#trunktestscommentslashesphp">trunk/tests/comment/slashes.php</a></li>
<li><a href="#trunktestsfunctionsdeprecatedphp">trunk/tests/functions/deprecated.php</a></li>
<li><a href="#trunktestsimagebasephp">trunk/tests/image/base.php</a></li>
<li><a href="#trunktestsimagefunctionsphp">trunk/tests/image/functions.php</a></li>
<li><a href="#trunktestsimageresizephp">trunk/tests/image/resize.php</a></li>
<li><a href="#trunktestsimageresize_gdphp">trunk/tests/image/resize_gd.php</a></li>
<li><a href="#trunktestsimageresize_imagickphp">trunk/tests/image/resize_imagick.php</a></li>
<li><a href="#trunktestslinkphp">trunk/tests/link.php</a></li>
<li><a href="#trunktestsoptionslashesphp">trunk/tests/option/slashes.php</a></li>
<li><a href="#trunktestspostformatsphp">trunk/tests/post/formats.php</a></li>
<li><a href="#trunktestspostqueryphp">trunk/tests/post/query.php</a></li>
<li><a href="#trunktestspostslashesphp">trunk/tests/post/slashes.php</a></li>
<li><a href="#trunkteststermslashesphp">trunk/tests/term/slashes.php</a></li>
<li><a href="#trunktestsuserslashesphp">trunk/tests/user/slashes.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkincludesmockimageeditorphp">trunk/includes/mock-image-editor.php</a></li>
<li><a href="#trunktestsadminincludesFilephp">trunk/tests/admin/includesFile.php</a></li>
<li><a href="#trunktestsadminincludesPostphp">trunk/tests/admin/includesPost.php</a></li>
<li><a href="#trunktestsadminbarphp">trunk/tests/adminbar.php</a></li>
<li><a href="#trunktestscommentphp">trunk/tests/comment.php</a></li>
<li><a href="#trunktestsincludesfactoryphp">trunk/tests/includes/factory.php</a></li>
<li><a href="#trunktestsiteratorsphp">trunk/tests/iterators.php</a></li>
<li><a href="#trunktestsl10nphp">trunk/tests/l10n.php</a></li>
<li><a href="#trunktestslinkphp">trunk/tests/link.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkincludesmockimageeditorphp"></a>
<div class="propset"><h4>Property changes: trunk/includes/mock-image-editor.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestsadminincludesFilephp"></a>
<div class="propset"><h4>Property changes: trunk/tests/admin/includesFile.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestsadminincludesPostphp"></a>
<div class="propset"><h4>Property changes: trunk/tests/admin/includesPost.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestsadminincludesScreenphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/admin/includesScreen.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/admin/includesScreen.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/admin/includesScreen.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> $this->assertFalse( $current_screen->in_admin( 'network' ) );
</span><span class="cx"> $this->assertFalse( $current_screen->in_admin( 'user' ) );
</span><span class="cx"> $this->assertFalse( $current_screen->in_admin( 'garbage' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // With convert_to_screen(), the same ID should return the exact $current_screen.
</span><span class="cx"> $this->assertSame( $current_screen, convert_to_screen( $screen->id ), $hook_name );
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsadminbarphp"></a>
<div class="propset"><h4>Property changes: trunk/tests/adminbar.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestsajaxResponsephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/ajax/Response.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/ajax/Response.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/ajax/Response.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> * Test that charset in header matches blog_charset
</span><span class="cx"> * Note: headers_list doesn't work properly in CLI mode, fall back on
</span><span class="cx"> * xdebug_get_headers if it's available
</span><del>- * Needs a separate process to get around the headers/output from the
</del><ins>+ * Needs a separate process to get around the headers/output from the
</ins><span class="cx"> * bootstrapper
</span><span class="cx"> * @ticket 19448
</span><span class="cx"> * @runInSeparateProcess
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> * @ticket 19448
</span><span class="cx"> */
</span><span class="cx"> public function test_response_charset_in_xml() {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Generate an ajax response
</span><span class="cx"> ob_start();
</span><span class="cx"> $ajax_response = new WP_Ajax_Response();
</span></span></pre></div>
<a id="trunktestsattachmentslashesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/attachment/slashes.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/attachment/slashes.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/attachment/slashes.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> $this->author_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx"> $this->old_current_user = get_current_user_id();
</span><span class="cx"> wp_set_current_user( $this->author_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> // it is important to test with both even and odd numbered slashes as
</span><span class="cx"> // kses does a strip-then-add slashes in some of it's function calls
</span><span class="cx"> $this->slash_1 = 'String with 1 slash \\';
</span></span></pre></div>
<a id="trunktestscanonicalpermalinkFormatsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/canonical/permalinkFormats.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/canonical/permalinkFormats.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/canonical/permalinkFormats.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -1,18 +1,18 @@
</span><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * @group canonical
</span><span class="cx"> * @group rewrite
</span><span class="cx"> * @group query
</span><span class="cx"> */
</span><span class="cx"> class Tests_Canonical_PermalinkFormat extends WP_UnitTestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * @ticket 21167
</span><span class="cx"> */
</span><span class="cx"> public function test_dotted_formats() {
</span><span class="cx"> global $wp_rewrite;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Create a sample post
</span><span class="cx"> $cat_id = $this->factory->term->create( array(
</span><span class="cx"> 'name' => 'permalink-test',
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 'category' => $cat_id
</span><span class="cx"> ) );
</span><span class="cx"> wp_set_post_categories( $post_id, array( $cat_id ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Sample permalinks
</span><span class="cx"> $tests = array(
</span><span class="cx"> '/%postname%.%post_id%/ ' => array(
</span><span class="lines">@@ -57,21 +57,21 @@
</span><span class="cx"> 'url' => 'index.php?year=$1&monthnum=$2&day=$3&hour=$4&minute=$5&second=$6&p=$7&name=$8&%category%$9&author_name=$10&page=$11'
</span><span class="cx"> ),
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Test permalinks
</span><span class="cx"> foreach ( $tests as $permalink_format => $expected ) {
</span><span class="cx"> update_option( 'permalink_structure', $permalink_format );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get the rewrite rules
</span><span class="cx"> $rules = $wp_rewrite->generate_rewrite_rules( get_option( 'permalink_structure' ), EP_PERMALINK, false, false, false, false );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Filter out only the post rewrite rule
</span><span class="cx"> foreach ( $rules as $regex => $url ) {
</span><span class="cx"> if ( false === strpos( $url, 'attachment=$' ) && false === strpos( $url, 'tb=' ) && false === strpos( $url, 'cpage=$' ) ) {
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Test that expected === actual
</span><span class="cx"> $this->assertEquals( $regex, $expected['regex'], "Problem with permalink format: $permalink_format" );
</span><span class="cx"> $this->assertEquals( $url, $expected['url'], "Problem with permalink format: $permalink_format" );
</span></span></pre></div>
<a id="trunktestscommentslashesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/comment/slashes.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/comment/slashes.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/comment/slashes.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> $this->author_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx"> $this->old_current_user = get_current_user_id();
</span><span class="cx"> wp_set_current_user( $this->author_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> // it is important to test with both even and odd numbered slashes as
</span><span class="cx"> // kses does a strip-then-add slashes in some of it's function calls
</span><span class="cx"> $this->slash_1 = 'String with 1 slash \\';
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> function test_wp_new_comment() {
</span><span class="cx"> $post_id = $this->factory->post->create();
</span><span class="cx">
</span><del>- // not testing comment_author_email or comment_author_url
</del><ins>+ // not testing comment_author_email or comment_author_url
</ins><span class="cx"> // as slashes are not permitted in that data
</span><span class="cx"> $data = array(
</span><span class="cx"> 'comment_post_ID' => $post_id,
</span><span class="lines">@@ -73,14 +73,14 @@
</span><span class="cx"> 'comment_post_ID' => $post_id
</span><span class="cx"> ));
</span><span class="cx">
</span><del>- // not testing comment_author_email or comment_author_url
</del><ins>+ // not testing comment_author_email or comment_author_url
</ins><span class="cx"> // as slashes are not permitted in that data
</span><span class="cx"> $_POST = array();
</span><span class="cx"> $_POST['comment_ID'] = $comment_id;
</span><span class="cx"> $_POST['newcomment_author'] = $this->slash_1;
</span><span class="cx"> $_POST['content'] = $this->slash_7;
</span><span class="cx"> $_POST = add_magic_quotes( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> edit_comment();
</span><span class="cx"> $comment = get_comment( $comment_id );
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> $_POST['newcomment_author'] = $this->slash_2;
</span><span class="cx"> $_POST['content'] = $this->slash_4;
</span><span class="cx"> $_POST = add_magic_quotes( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> edit_comment();
</span><span class="cx"> $comment = get_comment( $comment_id );
</span><span class="cx">
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> */
</span><span class="cx"> function test_wp_insert_comment() {
</span><span class="cx"> $post_id = $this->factory->post->create();
</span><del>-
</del><ins>+
</ins><span class="cx"> $comment_id = wp_insert_comment(array(
</span><span class="cx"> 'comment_post_ID' => $post_id,
</span><span class="cx"> 'comment_author' => $this->slash_1,
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> $comment_id = $this->factory->comment->create(array(
</span><span class="cx"> 'comment_post_ID' => $post_id
</span><span class="cx"> ));
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_update_comment(array(
</span><span class="cx"> 'comment_ID' => $comment_id,
</span><span class="cx"> 'comment_author' => $this->slash_1,
</span></span></pre></div>
<a id="trunktestscommentphp"></a>
<div class="propset"><h4>Property changes: trunk/tests/comment.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestsfunctionsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/functions/deprecated.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/functions/deprecated.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/functions/deprecated.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> * @var string[]
</span><span class="cx"> */
</span><span class="cx"> protected $_deprecated_files = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Set up the test fixture
</span><span class="cx"> * @return void
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> 'message' => $message
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Check if something was deprecated
</span><span class="cx"> * @param string $type argument|function|file
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test that wp_save_image_file has a deprecated argument when passed a GD resource
</span><span class="cx"> * @ticket 6821
</span><span class="lines">@@ -149,9 +149,9 @@
</span><span class="cx">
</span><span class="cx"> // Check if the arg was deprecated
</span><span class="cx"> $check = $this->was_deprecated( 'argument', 'wp_save_image_file' );
</span><del>- $this->assertNotEmpty( $check );
</del><ins>+ $this->assertNotEmpty( $check );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test that wp_save_image_file doesn't have a deprecated argument when passed a WP_Image_Editor
</span><span class="cx"> * @ticket 6821
</span></span></pre></div>
<a id="trunktestsimagebasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/base.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/base.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/image/base.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'image_editor_class', array( $this, 'setEngine') );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Undo the image editor override
</span><span class="cx"> */
</span><span class="lines">@@ -29,5 +29,5 @@
</span><span class="cx"> */
</span><span class="cx"> public function setEngine() {
</span><span class="cx"> return $this->editor_engine;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunktestsimagefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/functions.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/functions.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/image/functions.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -13,11 +13,11 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> protected function get_mime_type( $filename ) {
</span><del>- $mime_type = '';
- if ( extension_loaded( 'fileinfo' ) ) {
</del><ins>+ $mime_type = '';
+ if ( extension_loaded( 'fileinfo' ) ) {
</ins><span class="cx"> $finfo = new finfo();
</span><span class="cx"> $mime_type = $finfo->file( $filename, FILEINFO_MIME );
</span><del>- } elseif ( function_exists('mime_content_type') ) {
</del><ins>+ } elseif ( function_exists('mime_content_type') ) {
</ins><span class="cx"> $mime_type = mime_content_type( $filename );
</span><span class="cx"> }
</span><span class="cx"> if ( false !== strpos( $mime_type, ';' ) ) {
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $mime_type;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_is_image_positive() {
</span><span class="cx"> // these are all image files recognized by php
</span><span class="cx"> $files = array(
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> foreach ($files as $file) {
</span><span class="cx"> $this->assertFalse( file_is_displayable_image( DIR_TESTDATA.'/images/'.$file ), "file_is_valid_image($file) should return false" );
</span><span class="cx"> }
</span><del>- }
-
</del><ins>+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Test save image file and mime_types
</span><span class="cx"> * @ticket 6821
</span><span class="lines">@@ -107,11 +107,11 @@
</span><span class="cx"> 'image/gif',
</span><span class="cx"> 'image/png'
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Test each image editor engine
</span><span class="cx"> $classes = array('WP_Image_Editor_GD', 'WP_Image_Editor_Imagick');
</span><span class="cx"> foreach ( $classes as $class ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // If the image editor isn't available, skip it
</span><span class="cx"> if ( ! call_user_func( array( $class, 'test' ) ) ) {
</span><span class="cx"> continue;
</span><span class="lines">@@ -121,15 +121,15 @@
</span><span class="cx">
</span><span class="cx"> // Call wp_save_image_file
</span><span class="cx"> $img = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Save a file as each mime type, assert it works
</span><span class="cx"> foreach ( $mime_types as $mime_type ) {
</span><del>- $file = wp_tempnam();
</del><ins>+ $file = wp_tempnam();
</ins><span class="cx"> $ret = wp_save_image_file( $file, $img, $mime_type, 1 );
</span><span class="cx"> $this->assertNotEmpty( $ret );
</span><span class="cx"> $this->assertNotInstanceOf( 'WP_Error', $ret );
</span><span class="cx"> $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Clean up
</span><span class="cx"> @unlink( $file );
</span><span class="cx"> @unlink( $ret['path'] );
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> unset( $img );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test that a passed mime type overrides the extension in the filename
</span><span class="cx"> * @ticket 6821
</span><span class="lines">@@ -162,12 +162,12 @@
</span><span class="cx"> $mime_type = 'image/gif';
</span><span class="cx"> $file = wp_tempnam( 'tmp.jpg' );
</span><span class="cx"> $ret = $img->save( $file, $mime_type );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make assertions
</span><span class="cx"> $this->assertNotEmpty( $ret );
</span><span class="cx"> $this->assertNotInstanceOf( 'WP_Error', $ret );
</span><span class="cx"> $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Clean up
</span><span class="cx"> @unlink( $file );
</span><span class="cx"> @unlink( $ret['path'] );
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> }
</span><span class="cx"> $filter = create_function( '', "return '$class';" );
</span><span class="cx"> add_filter( 'image_editor_class', $filter );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Save the image as each file extension, check the mime type
</span><span class="cx"> $img = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx"> $temp = get_temp_dir();
</span></span></pre></div>
<a id="trunktestsimageresizephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/resize.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/resize.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/image/resize.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> $this->assertInstanceOf( 'WP_Error', $image );
</span><span class="cx"> $this->assertEquals( 'error_loading_image', $image->get_error_code() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Try resizing a php file (bad image)
</span><span class="cx"> * @ticket 6821
</span></span></pre></div>
<a id="trunktestsimageresize_gdphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/resize_gd.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/resize_gd.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/image/resize_gd.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Use the GD image editor engine
</span><del>- * @var string
</del><ins>+ * @var string
</ins><span class="cx"> */
</span><span class="cx"> public $editor_engine = 'WP_Image_Editor_GD';
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunktestsimageresize_imagickphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/resize_imagick.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/resize_imagick.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/image/resize_imagick.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Use the Imagick image editor engine
</span><del>- * @var string
</del><ins>+ * @var string
</ins><span class="cx"> */
</span><span class="cx"> public $editor_engine = 'WP_Image_Editor_Imagick';
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunktestsincludesfactoryphp"></a>
<div class="propset"><h4>Property changes: trunk/tests/includes/factory.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestsiteratorsphp"></a>
<div class="propset"><h4>Property changes: trunk/tests/iterators.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestsl10nphp"></a>
<div class="propset"><h4>Property changes: trunk/tests/l10n.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestslinkphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/link.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/link.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/link.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> add_filter( 'home_url', array( $this, '_get_pagenum_link_cb' ) );
</span><span class="cx"> $_SERVER['REQUEST_URI'] = '/woohoo';
</span><span class="cx"> $paged = get_pagenum_link( 2 );
</span><del>-
</del><ins>+
</ins><span class="cx"> remove_filter( 'home_url', array( $this, '_get_pagenum_link_cb' ) );
</span><span class="cx"> $this->assertEquals( $paged, home_url( '/WooHoo/page/2/' ) );
</span><span class="cx">
</span><span class="cx">Property changes on: trunk/tests/link.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunktestsoptionslashesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/option/slashes.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/option/slashes.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/option/slashes.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -34,14 +34,14 @@
</span><span class="cx"> $this->assertEquals( $this->slash_3, get_option( 'slash_test_3' ) );
</span><span class="cx"> $this->assertEquals( $this->slash_4, get_option( 'slash_test_4' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Tests the model function that expects un-slashed data
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function test_update_option() {
</span><span class="cx"> add_option( 'slash_test_5', 'foo' );
</span><del>-
</del><ins>+
</ins><span class="cx"> update_option( 'slash_test_5', $this->slash_1 );
</span><span class="cx"> $this->assertEquals( $this->slash_1, get_option( 'slash_test_5' ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestspostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/post/formats.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/post/formats.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/post/formats.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> // The previous set can now be retrieved.
</span><span class="cx"> $format = get_post_format( $post_id );
</span><span class="cx"> $this->assertEquals( 'aside', $format );
</span><del>-
</del><ins>+
</ins><span class="cx"> $result = set_post_format( $post_id, 'standard' );
</span><span class="cx"> $this->assertNotInstanceOf( 'WP_Error', $result );
</span><span class="cx"> $this->assertInternalType( 'array', $result );
</span></span></pre></div>
<a id="trunktestspostqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/post/query.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/post/query.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/post/query.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> 'terms' => false,
</span><span class="cx"> 'operator' => 'IN'
</span><span class="cx"> )
</span><del>- )
</del><ins>+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $posts = $query->get_posts();
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> add_post_meta( $post_id4, 'time', 1 );
</span><span class="cx"> $post_id5 = $this->factory->post->create();
</span><span class="cx"> add_post_meta( $post_id5, 'time', 1000 );
</span><del>-
</del><ins>+
</ins><span class="cx"> $args = array(
</span><span class="cx"> 'meta_key' => 'time',
</span><span class="cx"> 'meta_value' => array( 1, 1000 ),
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> }
</span><span class="cx"> $posts = wp_list_pluck( $query->posts, 'ID' );
</span><span class="cx"> $this->assertEqualSets( array( $post_id2, $post_id3 ), $posts );
</span><del>-
</del><ins>+
</ins><span class="cx"> $args = array(
</span><span class="cx"> 'meta_key' => 'time',
</span><span class="cx"> 'meta_value' => array( 1, 1000 ),
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> 'field' => 'id',
</span><span class="cx"> 'terms' => array( $cat_a ),
</span><span class="cx"> )
</span><del>- )
</del><ins>+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( 4 , count( $posts ) );
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> 'terms' => array( $cat_a ),
</span><span class="cx"> 'include_children' => false
</span><span class="cx"> )
</span><del>- )
</del><ins>+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( 1 , count( $posts ) );
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> 'field' => 'id',
</span><span class="cx"> 'terms' => array( $cat_b ),
</span><span class="cx"> )
</span><del>- )
</del><ins>+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( 3 , count( $posts ) );
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> 'terms' => array( $cat_b ),
</span><span class="cx"> 'include_children' => false
</span><span class="cx"> )
</span><del>- )
</del><ins>+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( 1 , count( $posts ) );
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> 'field' => 'id',
</span><span class="cx"> 'terms' => array( $cat_c ),
</span><span class="cx"> )
</span><del>- )
</del><ins>+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( 1 , count( $posts ) );
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> 'terms' => array( $cat_c ),
</span><span class="cx"> 'include_children' => false
</span><span class="cx"> )
</span><del>- )
</del><ins>+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( 1 , count( $posts ) );
</span></span></pre></div>
<a id="trunktestspostslashesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/post/slashes.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/post/slashes.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/post/slashes.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> $this->author_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx"> $this->old_current_user = get_current_user_id();
</span><span class="cx"> wp_set_current_user( $this->author_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> // it is important to test with both even and odd numbered slashes as
</span><span class="cx"> // kses does a strip-then-add slashes in some of it's function calls
</span><span class="cx"> $this->slash_1 = 'String with 1 slash \\';
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> */
</span><span class="cx"> function test_wp_update_post() {
</span><span class="cx"> $id = $this->factory->post->create();
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_update_post(array(
</span><span class="cx"> 'ID' => $id,
</span><span class="cx"> 'post_title' => $this->slash_1,
</span></span></pre></div>
<a id="trunkteststermslashesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/term/slashes.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/term/slashes.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/term/slashes.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -38,14 +38,14 @@
</span><span class="cx"> 'newcategory' => $this->slash_1
</span><span class="cx"> );
</span><span class="cx"> $_POST = add_magic_quotes( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make the request
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'add-category' );
</span><span class="cx"> } catch ( WPAjaxDieContinueException $e ) {
</span><span class="cx"> unset( $e );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $term = get_term_by( 'slug', 'string-with-1-slash', 'category' );
</span><span class="cx"> $this->assertEquals( $this->slash_1, $term->name );
</span><span class="cx">
</span><span class="lines">@@ -56,14 +56,14 @@
</span><span class="cx"> 'newcategory' => $this->slash_3
</span><span class="cx"> );
</span><span class="cx"> $_POST = add_magic_quotes( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make the request
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'add-category' );
</span><span class="cx"> } catch ( WPAjaxDieContinueException $e ) {
</span><span class="cx"> unset( $e );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $term = get_term_by( 'slug', 'string-with-3-slashes', 'category' );
</span><span class="cx"> $this->assertEquals( $this->slash_3, $term->name );
</span><span class="cx">
</span><span class="lines">@@ -74,19 +74,19 @@
</span><span class="cx"> 'newcategory' => $this->slash_2
</span><span class="cx"> );
</span><span class="cx"> $_POST = add_magic_quotes( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make the request
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'add-category' );
</span><span class="cx"> } catch ( WPAjaxDieContinueException $e ) {
</span><span class="cx"> unset( $e );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $term = get_term_by( 'slug', 'string-with-2-slashes', 'category' );
</span><span class="cx"> $this->assertEquals( $this->slash_2, $term->name );
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Tests the controller function that expects slashed data
</span><span class="cx"> *
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> );
</span><span class="cx"> foreach ( $taxonomies as $taxonomy ) {
</span><span class="cx"> $_POST = $_GET = $_REQUEST = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> $_POST = array(
</span><span class="cx"> '_wpnonce_add-tag' => wp_create_nonce( 'add-tag' ),
</span><span class="cx"> 'taxonomy' => $taxonomy,
</span><span class="lines">@@ -107,14 +107,14 @@
</span><span class="cx"> 'description' => $this->slash_3
</span><span class="cx"> );
</span><span class="cx"> $_POST = add_magic_quotes( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make the request
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'add-tag' );
</span><span class="cx"> } catch ( WPAjaxDieContinueException $e ) {
</span><span class="cx"> unset( $e );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $term = get_term_by( 'slug', 'controller_slash_test_1_'.$taxonomy, $taxonomy );
</span><span class="cx"> $this->assertEquals( $this->slash_1, $term->name );
</span><span class="cx"> $this->assertEquals( $this->slash_3, $term->description );
</span><span class="lines">@@ -127,14 +127,14 @@
</span><span class="cx"> 'description' => $this->slash_5
</span><span class="cx"> );
</span><span class="cx"> $_POST = add_magic_quotes( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make the request
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'add-tag' );
</span><span class="cx"> } catch ( WPAjaxDieContinueException $e ) {
</span><span class="cx"> unset( $e );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $term = get_term_by( 'slug', 'controller_slash_test_2_'.$taxonomy, $taxonomy );
</span><span class="cx"> $this->assertEquals( $this->slash_3, $term->name );
</span><span class="cx"> $this->assertEquals( $this->slash_5, $term->description );
</span><span class="lines">@@ -147,20 +147,20 @@
</span><span class="cx"> 'description' => $this->slash_4
</span><span class="cx"> );
</span><span class="cx"> $_POST = add_magic_quotes( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make the request
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'add-tag' );
</span><span class="cx"> } catch ( WPAjaxDieContinueException $e ) {
</span><span class="cx"> unset( $e );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $term = get_term_by( 'slug', 'controller_slash_test_3_'.$taxonomy, $taxonomy );
</span><span class="cx"> $this->assertEquals( $this->slash_2, $term->name );
</span><span class="cx"> $this->assertEquals( $this->slash_4, $term->description );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Tests the model function that expects un-slashed data
</span><span class="cx"> *
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> $term = get_term( $insert['term_id'], $taxonomy );
</span><span class="cx"> $this->assertEquals( $this->slash_1, $term->name );
</span><span class="cx"> $this->assertEquals( $this->slash_3, $term->description );
</span><del>-
</del><ins>+
</ins><span class="cx"> $insert = wp_insert_term(
</span><span class="cx"> $this->slash_3,
</span><span class="cx"> $taxonomy,
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> $term = get_term( $insert['term_id'], $taxonomy );
</span><span class="cx"> $this->assertEquals( $this->slash_3, $term->name );
</span><span class="cx"> $this->assertEquals( $this->slash_5, $term->description );
</span><del>-
</del><ins>+
</ins><span class="cx"> $insert = wp_insert_term(
</span><span class="cx"> $this->slash_2,
</span><span class="cx"> $taxonomy,
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> $id = $this->factory->term->create(array(
</span><span class="cx"> 'taxonomy' => $taxonomy
</span><span class="cx"> ));
</span><del>-
</del><ins>+
</ins><span class="cx"> $update = wp_update_term(
</span><span class="cx"> $id,
</span><span class="cx"> $taxonomy,
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> $term = get_term( $id, $taxonomy );
</span><span class="cx"> $this->assertEquals( $this->slash_1, $term->name );
</span><span class="cx"> $this->assertEquals( $this->slash_3, $term->description );
</span><del>-
</del><ins>+
</ins><span class="cx"> $update = wp_update_term(
</span><span class="cx"> $id,
</span><span class="cx"> $taxonomy,
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> $term = get_term( $id, $taxonomy );
</span><span class="cx"> $this->assertEquals( $this->slash_3, $term->name );
</span><span class="cx"> $this->assertEquals( $this->slash_5, $term->description );
</span><del>-
</del><ins>+
</ins><span class="cx"> $update = wp_update_term(
</span><span class="cx"> $id,
</span><span class="cx"> $taxonomy,
</span></span></pre></div>
<a id="trunktestsuserslashesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/user/slashes.php (1147 => 1148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/user/slashes.php 2012-11-21 13:37:21 UTC (rev 1147)
+++ trunk/tests/user/slashes.php 2012-11-21 15:01:28 UTC (rev 1148)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> $this->author_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx"> $this->old_current_user = get_current_user_id();
</span><span class="cx"> wp_set_current_user( $this->author_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> // it is important to test with both even and odd numbered slashes as
</span><span class="cx"> // kses does a strip-then-add slashes in some of it's function calls
</span><span class="cx"> $this->slash_1 = 'String with 1 slash \\';
</span></span></pre>
</div>
</div>
</body>
</html>