<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11930] trunk: Remove trailing whitespace</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11930">11930</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-09-14 14:03:32 +0000 (Mon, 14 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincommentphp">trunk/wp-admin/comment.php</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditpagesphp">trunk/wp-admin/edit-pages.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesclasspclzipphp">trunk/wp-admin/includes/class-pclzip.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemdirectphp">trunk/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpextphp">trunk/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpsocketsphp">trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemssh2php">trunk/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesexportphp">trunk/wp-admin/includes/export.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesimageeditphp">trunk/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadmininstallphp">trunk/wp-admin/install.php</a></li>
<li><a href="#trunkwpadminmediaphp">trunk/wp-admin/media.php</a></li>
<li><a href="#trunkwpadminmenuheaderphp">trunk/wp-admin/menu-header.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminupgradephp">trunk/wp-admin/upgrade.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesclassjsonphp">trunk/wp-includes/class-json.php</a></li>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludeshttpphp">trunk/wp-includes/http.php</a></li>
<li><a href="#trunkwpincludesksesphp">trunk/wp-includes/kses.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesregistrationphp">trunk/wp-includes/registration.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/comment.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/comment.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/comment.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'trash' == $comment->comment_approved )
</span><span class="cx"> comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
</span><del>-
</del><ins>+
</ins><span class="cx"> $comment = get_comment_to_edit( $comment_id );
</span><span class="cx">
</span><span class="cx"> include('edit-form-comment.php');
</span><span class="lines">@@ -170,12 +170,12 @@
</span><span class="cx"> case 'untrashcomment' :
</span><span class="cx"> $comment_id = absint( $_REQUEST['c'] );
</span><span class="cx"> $noredir = isset($_REQUEST['noredir']);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!$comment = get_comment($comment_id))
</span><span class="cx"> comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
</span><span class="cx"> if (!current_user_can('edit_post', $comment->comment_post_ID ))
</span><span class="cx"> comment_footer_die( __('You are not allowed to edit comments on this post.') );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($action == 'trashcomment') {
</span><span class="cx"> check_admin_referer( 'trash-comment_' . $comment_id );
</span><span class="cx"> wp_trash_comment($comment_id);
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> check_admin_referer( 'untrash-comment_' . $comment_id );
</span><span class="cx"> wp_untrash_comment($comment_id);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ('' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ))
</span><span class="cx"> wp_redirect( wp_get_referer() );
</span><span class="cx"> else if ('' != wp_get_original_referer() && false == $noredir)
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/edit-comments.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> if ( isset($_REQUEST['doaction']) || isset($_REQUEST['doaction2']) || isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']) ) {
</span><span class="cx"> check_admin_referer('bulk-comments');
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2'])) && !empty($_REQUEST['pagegen_timestamp'])) {
</span><span class="cx"> $comment_status = $wpdb->escape($_REQUEST['comment_status']);
</span><span class="cx"> $delete_time = $wpdb->escape($_REQUEST['pagegen_timestamp']);
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> $comment_ids = $_REQUEST['delete_comments'];
</span><span class="cx"> $doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
</span><span class="cx"> } else wp_redirect($_SERVER['HTTP_REFERER']);
</span><del>-
</del><ins>+
</ins><span class="cx"> $approved = $unapproved = $spammed = $trashed = $untrashed = $deleted = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ($comment_ids as $comment_id) { // Check the permissions on each
</span><span class="cx"> $_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditpagesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-pages.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-pages.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/edit-pages.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !wp_trash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in moving to trash...') );
</span><del>-
</del><ins>+
</ins><span class="cx"> $trashed++;
</span><span class="cx"> }
</span><span class="cx"> $sendback = add_query_arg('trashed', $trashed, $sendback);
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !wp_untrash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in restoring from trash...') );
</span><del>-
</del><ins>+
</ins><span class="cx"> $untrashed++;
</span><span class="cx"> }
</span><span class="cx"> $sendback = add_query_arg('untrashed', $untrashed, $sendback);
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/edit.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !wp_trash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in moving to trash...') );
</span><del>-
</del><ins>+
</ins><span class="cx"> $trashed++;
</span><span class="cx"> }
</span><span class="cx"> $sendback = add_query_arg('trashed', $trashed, $sendback);
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !wp_untrash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in restoring from trash...') );
</span><del>-
</del><ins>+
</ins><span class="cx"> $untrashed++;
</span><span class="cx"> }
</span><span class="cx"> $sendback = add_query_arg('untrashed', $untrashed, $sendback);
</span></span></pre></div>
<a id="trunkwpadminincludesclasspclzipphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-pclzip.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-pclzip.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/class-pclzip.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
</span><span class="cx"> define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- File list separator
</span><span class="cx"> // In version 1.x of PclZip, the separator for file list is a space
</span><span class="cx"> // (which is not a very smart choice, specifically for windows paths !).
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> // ----- Optional threshold ratio for use of temporary files
</span><span class="cx"> // Pclzip sense the size of the file to add/extract and decide to
</span><del>- // use or not temporary file. The algorythm is looking for
</del><ins>+ // use or not temporary file. The algorythm is looking for
</ins><span class="cx"> // memory_limit of PHP and apply a ratio.
</span><span class="cx"> // threshold = memory_limit * ratio.
</span><span class="cx"> // Recommended values are under 0.5. Default 0.47.
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
</span><span class="cx"> define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
</span><span class="cx"> define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- File description attributes
</span><span class="cx"> define( 'PCLZIP_ATT_FILE_NAME', 79001 );
</span><span class="cx"> define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> // ----- Internal error handling
</span><span class="cx"> var $error_code = 1;
</span><span class="cx"> var $error_string = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Current status of the magic_quotes_runtime
</span><span class="cx"> // This value store the php configuration for magic_quotes
</span><span class="cx"> // The class can then disable the magic_quotes and reset it after
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for default option values
</span><span class="cx"> $this->privOptionDefaultThreshold($v_options);
</span><span class="cx">
</span><span class="lines">@@ -350,16 +350,16 @@
</span><span class="cx"> $v_att_list = array();
</span><span class="cx"> $v_filedescr_list = array();
</span><span class="cx"> $p_result_list = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look if the $p_filelist is really an array
</span><span class="cx"> if (is_array($p_filelist)) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look if the first element is also an array
</span><span class="cx"> // This will mean that this is a file description entry
</span><span class="cx"> if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
</span><span class="cx"> $v_att_list = $p_filelist;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- The list is a list of string names
</span><span class="cx"> else {
</span><span class="cx"> $v_string_list = $p_filelist;
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Reformat the string list
</span><span class="cx"> if (sizeof($v_string_list) != 0) {
</span><span class="cx"> foreach ($v_string_list as $v_string) {
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- For each file in the list check the attributes
</span><span class="cx"> $v_supported_attributes
</span><span class="cx"> = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
</span><span class="lines">@@ -549,16 +549,16 @@
</span><span class="cx"> $v_att_list = array();
</span><span class="cx"> $v_filedescr_list = array();
</span><span class="cx"> $p_result_list = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look if the $p_filelist is really an array
</span><span class="cx"> if (is_array($p_filelist)) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look if the first element is also an array
</span><span class="cx"> // This will mean that this is a file description entry
</span><span class="cx"> if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
</span><span class="cx"> $v_att_list = $p_filelist;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- The list is a list of string names
</span><span class="cx"> else {
</span><span class="cx"> $v_string_list = $p_filelist;
</span><span class="lines">@@ -577,14 +577,14 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Reformat the string list
</span><span class="cx"> if (sizeof($v_string_list) != 0) {
</span><span class="cx"> foreach ($v_string_list as $v_string) {
</span><span class="cx"> $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- For each file in the list check the attributes
</span><span class="cx"> $v_supported_attributes
</span><span class="cx"> = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
</span><span class="lines">@@ -1049,7 +1049,7 @@
</span><span class="cx"> // Options :
</span><span class="cx"> // PCLZIP_OPT_BY_INDEX :
</span><span class="cx"> // PCLZIP_OPT_BY_NAME :
</span><del>- // PCLZIP_OPT_BY_EREG :
</del><ins>+ // PCLZIP_OPT_BY_EREG :
</ins><span class="cx"> // PCLZIP_OPT_BY_PREG :
</span><span class="cx"> // Return Values :
</span><span class="cx"> // 0 on failure,
</span><span class="lines">@@ -1124,7 +1124,7 @@
</span><span class="cx"> function deleteByIndex($p_index)
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::deleteByIndex", "index='$p_index'");
</span><del>-
</del><ins>+
</ins><span class="cx"> $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
</span><span class="cx">
</span><span class="cx"> // ----- Return
</span><span class="lines">@@ -1178,7 +1178,7 @@
</span><span class="cx"> if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
</span><span class="cx"> {
</span><span class="cx"> $this->privSwapBackMagicQuotes();
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Error log
</span><span class="cx"> PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
</span><span class="cx">
</span><span class="lines">@@ -1507,7 +1507,7 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privParseOptions", "");
</span><span class="cx"> $v_result=1;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Read the options
</span><span class="cx"> $i=0;
</span><span class="cx"> while ($i<$p_size) {
</span><span class="lines">@@ -1552,14 +1552,14 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
</span><span class="cx"> return PclZip::errorCode();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Check for incompatible options
</span><span class="cx"> if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
</span><span class="cx"> PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
</span><span class="cx"> return PclZip::errorCode();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Check the value
</span><span class="cx"> $v_value = $p_options_list[$i+1];
</span><span class="cx"> if ((!is_integer($v_value)) || ($v_value<0)) {
</span><span class="lines">@@ -1581,7 +1581,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
</span><span class="cx"> return PclZip::errorCode();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $v_result_list[$p_options_list[$i]] = true;
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
</span><span class="cx"> break;
</span><span class="lines">@@ -1599,7 +1599,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
</span><span class="cx"> return PclZip::errorCode();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $v_result_list[$p_options_list[$i]] = true;
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
</span><span class="cx"> break;
</span><span class="lines">@@ -1763,7 +1763,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
</span><span class="cx"> return PclZip::errorCode();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Reduce the index list
</span><span class="cx"> // each index item in the list must be a couple with a start and
</span><span class="cx"> // an end value : [0,3], [5-5], [8-10], ...
</span><span class="lines">@@ -1774,10 +1774,10 @@
</span><span class="cx"> // ----- Explode the item
</span><span class="cx"> $v_item_list = explode("-", $v_work_list[$j]);
</span><span class="cx"> $v_size_item_list = sizeof($v_item_list);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- TBC : Here we might check that each item is a
</span><span class="cx"> // real integer ...
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for single value
</span><span class="cx"> if ($v_size_item_list == 1) {
</span><span class="cx"> // ----- Set the option value
</span><span class="lines">@@ -1815,7 +1815,7 @@
</span><span class="cx"> }
</span><span class="cx"> $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Sort the items
</span><span class="cx"> if ($v_sort_flag) {
</span><span class="cx"> // TBC : To Be Completed
</span><span class="lines">@@ -1928,11 +1928,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for default values
</span><span class="cx"> if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Calculate auto threshold");
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ----- Return
</span><span class="lines">@@ -1951,19 +1951,19 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privOptionDefaultThreshold", "");
</span><span class="cx"> $v_result=1;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
</span><span class="cx"> || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Create an auto-threshold for use of temporay files");
</span><span class="cx"> // ----- Get 'memory_limit' configuration value
</span><span class="cx"> $v_memory_limit = ini_get('memory_limit');
</span><span class="cx"> $v_memory_limit = trim($v_memory_limit);
</span><span class="cx"> $last = strtolower(substr($v_memory_limit, -1));
</span><del>-
</del><ins>+
</ins><span class="cx"> if($last == 'g')
</span><span class="cx"> //$v_memory_limit = $v_memory_limit*1024*1024*1024;
</span><span class="cx"> $v_memory_limit = $v_memory_limit*1073741824;
</span><span class="lines">@@ -1972,9 +1972,9 @@
</span><span class="cx"> $v_memory_limit = $v_memory_limit*1048576;
</span><span class="cx"> if($last == 'k')
</span><span class="cx"> $v_memory_limit = $v_memory_limit*1024;
</span><del>-
</del><ins>+
</ins><span class="cx"> $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
</span><del>-
</del><ins>+
</ins><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Current memory usage : ".memory_get_usage(TRUE)." bytes");
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Threshold value is : ".$p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]." bytes");
</span><span class="cx">
</span><span class="lines">@@ -1983,7 +1983,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Unset the threshold (value ".$p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD].") because under 1Mo sanity check)");
</span><span class="cx"> unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Return
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="lines">@@ -2002,10 +2002,10 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privFileDescrParseAtt", "");
</span><span class="cx"> $v_result=1;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- For each file in the list check the attributes
</span><span class="cx"> foreach ($p_file_list as $v_key => $v_value) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Check if the option is supported
</span><span class="cx"> if (!isset($v_requested_options[$v_key])) {
</span><span class="cx"> // ----- Error log
</span><span class="lines">@@ -2027,7 +2027,7 @@
</span><span class="cx">
</span><span class="cx"> $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($v_key)." = '".$v_value."'");
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($p_filedescr['filename'] == '') {
</span><span class="cx"> PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
</span><span class="lines">@@ -2123,10 +2123,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // end foreach
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Return
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="lines">@@ -2140,7 +2140,7 @@
</span><span class="cx"> // or a string to be added as file. For any other type of files (link, other)
</span><span class="cx"> // just ignore the item.
</span><span class="cx"> // Then prepare the information that will be stored for that file.
</span><del>- // When its a folder, expand the folder with all the files that are in that
</del><ins>+ // When its a folder, expand the folder with all the files that are in that
</ins><span class="cx"> // folder (recursively).
</span><span class="cx"> // Parameters :
</span><span class="cx"> // Return Values :
</span><span class="lines">@@ -2151,23 +2151,23 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privFileDescrExpand", "");
</span><span class="cx"> $v_result=1;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Create a result list
</span><span class="cx"> $v_result_list = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look each entry
</span><span class="cx"> for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Looking for file ".$i.".");
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Get filedescr
</span><span class="cx"> $v_descr = $p_filedescr_list[$i];
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Reduce the filename
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filedescr before reduction :'".$v_descr['filename']."'");
</span><span class="cx"> $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
</span><span class="cx"> $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filedescr after reduction :'".$v_descr['filename']."'");
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for real file or folder
</span><span class="cx"> if (file_exists($v_descr['filename'])) {
</span><span class="cx"> if (@is_file($v_descr['filename'])) {
</span><span class="lines">@@ -2189,13 +2189,13 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for string added as file
</span><span class="cx"> else if (isset($v_descr['content'])) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "This is a string added as a file");
</span><span class="cx"> $v_descr['type'] = 'virtual_file';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Missing file
</span><span class="cx"> else {
</span><span class="cx"> // ----- Error log
</span><span class="lines">@@ -2206,13 +2206,13 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
</span><span class="cx"> return PclZip::errorCode();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Calculate the stored filename
</span><span class="cx"> $this->privCalculateStoredFilename($v_descr, $p_options);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Add the descriptor in result list
</span><span class="cx"> $v_result_list[sizeof($v_result_list)] = $v_descr;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for folder
</span><span class="cx"> if ($v_descr['type'] == 'folder') {
</span><span class="cx"> // ----- List of items in folder
</span><span class="lines">@@ -2226,10 +2226,10 @@
</span><span class="cx"> if (($v_item_handler == '.') || ($v_item_handler == '..')) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Compose the full filename
</span><span class="cx"> $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for different stored filename
</span><span class="cx"> // Because the name of the folder was changed, the name of the
</span><span class="cx"> // files/sub-folders also change
</span><span class="lines">@@ -2241,17 +2241,17 @@
</span><span class="cx"> $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $v_dirlist_nb++;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> @closedir($v_folder_handler);
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to open dir '".$v_descr['filename']."' in read mode. Skipped.");
</span><span class="cx"> // TBC : unable to open folder in read mode
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Expand each element of the list
</span><span class="cx"> if ($v_dirlist_nb != 0) {
</span><span class="cx"> // ----- Expand
</span><span class="lines">@@ -2259,7 +2259,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Concat the resulting list
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Merging result list (size '".sizeof($v_result_list)."') with dirlist (size '".sizeof($v_dirlist_descr)."')");
</span><span class="cx"> $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
</span><span class="lines">@@ -2268,12 +2268,12 @@
</span><span class="cx"> else {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Nothing in this folder to expand.");
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Free local array
</span><span class="cx"> unset($v_dirlist_descr);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Get the result list
</span><span class="cx"> $p_filedescr_list = $v_result_list;
</span><span class="cx">
</span><span class="lines">@@ -2294,7 +2294,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCreate", "list");
</span><span class="cx"> $v_result=1;
</span><span class="cx"> $v_list_detail = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Magic quotes trick
</span><span class="cx"> $this->privDisableMagicQuotes();
</span><span class="cx">
</span><span class="lines">@@ -2655,7 +2655,7 @@
</span><span class="cx"> // Function : privAddFileList()
</span><span class="cx"> // Description :
</span><span class="cx"> // Parameters :
</span><del>- // $p_filedescr_list : An array containing the file description
</del><ins>+ // $p_filedescr_list : An array containing the file description
</ins><span class="cx"> // or directory names to add in the zip
</span><span class="cx"> // $p_result_list : list of added files with their properties (specially the status field)
</span><span class="cx"> // Return Values :
</span><span class="lines">@@ -2675,7 +2675,7 @@
</span><span class="cx"> // ----- Format the filename
</span><span class="cx"> $p_filedescr_list[$j]['filename']
</span><span class="cx"> = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
</span><del>-
</del><ins>+
</ins><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Looking for file '".$p_filedescr_list[$j]['filename']."'");
</span><span class="cx">
</span><span class="cx"> // ----- Skip empty file names
</span><span class="lines">@@ -2735,7 +2735,7 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFile", "filename='".$p_filedescr['filename']."'");
</span><span class="cx"> $v_result=1;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Working variable
</span><span class="cx"> $p_filename = $p_filedescr['filename'];
</span><span class="cx">
</span><span class="lines">@@ -2748,8 +2748,8 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
</span><span class="cx"> return PclZip::errorCode();
</span><span class="cx"> }
</span><del>-
- // ----- Look for a stored different filename
</del><ins>+
+ // ----- Look for a stored different filename
</ins><span class="cx"> /* TBC : Removed
</span><span class="cx"> if (isset($p_filedescr['stored_filename'])) {
</span><span class="cx"> $v_stored_filename = $p_filedescr['stored_filename'];
</span><span class="lines">@@ -2786,20 +2786,20 @@
</span><span class="cx"> $p_header['external'] = 0x00000000;
</span><span class="cx"> $p_header['size'] = filesize($p_filename);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for regular folder
</span><span class="cx"> else if ($p_filedescr['type']=='folder') {
</span><span class="cx"> $p_header['external'] = 0x00000010;
</span><span class="cx"> $p_header['mtime'] = filemtime($p_filename);
</span><span class="cx"> $p_header['size'] = filesize($p_filename);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for virtual file
</span><span class="cx"> else if ($p_filedescr['type'] == 'virtual_file') {
</span><span class="cx"> $p_header['external'] = 0x00000000;
</span><span class="cx"> $p_header['size'] = strlen($p_filedescr['content']);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header external extension '".sprintf("0x%X",$p_header['external'])."'");
</span><span class="cx">
</span><span class="cx"> // ----- Look for filetime
</span><span class="lines">@@ -2855,7 +2855,7 @@
</span><span class="cx"> if ($p_header['stored_filename'] == "") {
</span><span class="cx"> $p_header['status'] = "filtered";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Check the path length
</span><span class="cx"> if (strlen($p_header['stored_filename']) > 0xFF) {
</span><span class="cx"> $p_header['status'] = 'filename_too_long';
</span><span class="lines">@@ -2867,7 +2867,7 @@
</span><span class="cx"> // ----- Look for a file
</span><span class="cx"> if ($p_filedescr['type'] == 'file') {
</span><span class="cx"> // ----- Look for using temporary file to zip
</span><del>- if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
</del><ins>+ if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
</ins><span class="cx"> && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
</span><span class="cx"> || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
</span><span class="cx"> && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
</span><span class="lines">@@ -2876,12 +2876,12 @@
</span><span class="cx"> return $v_result;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Use "in memory" zip algo
</span><span class="cx"> else {
</span><del>- //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"In memory compression.");
- //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Current memory usage : ".memory_get_usage(TRUE)." bytes");
- //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Current memory peak : ".memory_get_peak_usage(TRUE)." bytes");
</del><ins>+ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"In memory compression.");
+ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Current memory usage : ".memory_get_usage(TRUE)." bytes");
+ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Current memory peak : ".memory_get_peak_usage(TRUE)." bytes");
</ins><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "'".$p_filename."' is a file");
</span><span class="cx">
</span><span class="cx"> // ----- Open the source file
</span><span class="lines">@@ -2893,15 +2893,15 @@
</span><span class="cx">
</span><span class="cx"> // ----- Read the file content
</span><span class="cx"> $v_content = @fread($v_file, $p_header['size']);
</span><del>- //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory usage after reading file : ".memory_get_usage(TRUE)." bytes");
- //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory peak after reading file : ".memory_get_peak_usage(TRUE)." bytes");
</del><ins>+ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory usage after reading file : ".memory_get_usage(TRUE)." bytes");
+ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory peak after reading file : ".memory_get_peak_usage(TRUE)." bytes");
</ins><span class="cx">
</span><span class="cx"> // ----- Close the file
</span><span class="cx"> @fclose($v_file);
</span><span class="cx">
</span><span class="cx"> // ----- Calculate the CRC
</span><span class="cx"> $p_header['crc'] = @crc32($v_content);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for no compression
</span><span class="cx"> if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will not be compressed");
</span><span class="lines">@@ -2909,20 +2909,20 @@
</span><span class="cx"> $p_header['compressed_size'] = $p_header['size'];
</span><span class="cx"> $p_header['compression'] = 0;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for normal compression
</span><span class="cx"> else {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will be compressed");
</span><span class="cx"> // ----- Compress the content
</span><span class="cx"> $v_content = @gzdeflate($v_content);
</span><del>- //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory usage after gzdeflate : ".memory_get_usage(TRUE)." bytes");
- //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory peak after gzdeflate : ".memory_get_peak_usage(TRUE)." bytes");
</del><ins>+ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory usage after gzdeflate : ".memory_get_usage(TRUE)." bytes");
+ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory peak after gzdeflate : ".memory_get_peak_usage(TRUE)." bytes");
</ins><span class="cx">
</span><span class="cx"> // ----- Set header parameters
</span><span class="cx"> $p_header['compressed_size'] = strlen($v_content);
</span><span class="cx"> $p_header['compression'] = 8;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Call the header generation
</span><span class="cx"> if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
</span><span class="cx"> @fclose($v_file);
</span><span class="lines">@@ -2939,13 +2939,13 @@
</span><span class="cx">
</span><span class="cx"> // ----- Look for a virtual file (a file from string)
</span><span class="cx"> else if ($p_filedescr['type'] == 'virtual_file') {
</span><del>-
</del><ins>+
</ins><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Add by string");
</span><span class="cx"> $v_content = $p_filedescr['content'];
</span><span class="cx">
</span><span class="cx"> // ----- Calculate the CRC
</span><span class="cx"> $p_header['crc'] = @crc32($v_content);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for no compression
</span><span class="cx"> if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will not be compressed");
</span><span class="lines">@@ -2953,7 +2953,7 @@
</span><span class="cx"> $p_header['compressed_size'] = $p_header['size'];
</span><span class="cx"> $p_header['compression'] = 0;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for normal compression
</span><span class="cx"> else {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will be compressed");
</span><span class="lines">@@ -2964,7 +2964,7 @@
</span><span class="cx"> $p_header['compressed_size'] = strlen($v_content);
</span><span class="cx"> $p_header['compression'] = 8;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Call the header generation
</span><span class="cx"> if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
</span><span class="cx"> @fclose($v_file);
</span><span class="lines">@@ -3035,7 +3035,7 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFileUsingTempFile", "filename='".$p_filedescr['filename']."'");
</span><span class="cx"> $v_result=PCLZIP_ERR_NO_ERROR;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Working variable
</span><span class="cx"> $p_filename = $p_filedescr['filename'];
</span><span class="cx">
</span><span class="lines">@@ -3153,7 +3153,7 @@
</span><span class="cx">
</span><span class="cx"> // ----- Unlink the temporary file
</span><span class="cx"> @unlink($v_gzip_temp_name);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Return
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="lines">@@ -3172,7 +3172,7 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCalculateStoredFilename", "filename='".$p_filedescr['filename']."'");
</span><span class="cx"> $v_result=1;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Working variables
</span><span class="cx"> $p_filename = $p_filedescr['filename'];
</span><span class="cx"> if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
</span><span class="lines">@@ -3201,7 +3201,7 @@
</span><span class="cx"> $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Changing full name of '".$p_filename."' for '".$v_stored_filename."'");
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for path and/or short name change
</span><span class="cx"> else {
</span><span class="cx">
</span><span class="lines">@@ -3234,7 +3234,7 @@
</span><span class="cx">
</span><span class="cx"> if ( (substr($p_filename, 0, 2) == "./")
</span><span class="cx"> || (substr($p_remove_dir, 0, 2) == "./")) {
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( (substr($p_filename, 0, 2) == "./")
</span><span class="cx"> && (substr($p_remove_dir, 0, 2) != "./")) {
</span><span class="cx"> $p_remove_dir = "./".$p_remove_dir;
</span><span class="lines">@@ -3260,10 +3260,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Remove drive letter if any
</span><span class="cx"> $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for path to add
</span><span class="cx"> if ($p_add_dir != "") {
</span><span class="cx"> if (substr($p_add_dir, -1) == "/")
</span><span class="lines">@@ -3278,7 +3278,7 @@
</span><span class="cx"> $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
</span><span class="cx"> $p_filedescr['stored_filename'] = $v_stored_filename;
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Stored filename will be '".$p_filedescr['stored_filename']."', strlen ".strlen($p_filedescr['stored_filename']));
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Return
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="lines">@@ -3443,7 +3443,7 @@
</span><span class="cx"> {
</span><span class="cx"> // ----- Magic quotes trick
</span><span class="cx"> $this->privSwapBackMagicQuotes();
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Error log
</span><span class="cx"> PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
</span><span class="cx">
</span><span class="lines">@@ -3726,7 +3726,7 @@
</span><span class="cx"> else if ( (isset($p_options[PCLZIP_OPT_BY_INDEX]))
</span><span class="cx"> && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByIndex'");
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look if the index is in the list
</span><span class="cx"> for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Look if index '$i' is in [".$p_options[PCLZIP_OPT_BY_INDEX][$j]['start'].",".$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']."]");
</span><span class="lines">@@ -3766,7 +3766,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
</span><span class="cx">
</span><span class="cx"> $this->privSwapBackMagicQuotes();
</span><del>-
</del><ins>+
</ins><span class="cx"> PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
</span><span class="cx"> "Filename '".$v_header['stored_filename']."' is "
</span><span class="cx"> ."compressed by an unsupported compression "
</span><span class="lines">@@ -3776,7 +3776,7 @@
</span><span class="cx"> return PclZip::errorCode();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Check encrypted files
</span><span class="cx"> if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unsupported file encryption");
</span><span class="lines">@@ -3813,7 +3813,7 @@
</span><span class="cx">
</span><span class="cx"> $v_extract = false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for real extraction
</span><span class="cx"> if ($v_extract)
</span><span class="cx"> {
</span><span class="lines">@@ -3867,7 +3867,7 @@
</span><span class="cx">
</span><span class="cx"> // ----- Next extracted file
</span><span class="cx"> $v_nb_extracted++;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for user callback abort
</span><span class="cx"> if ($v_result1 == 2) {
</span><span class="cx"> break;
</span><span class="lines">@@ -4019,13 +4019,13 @@
</span><span class="cx"> if ($p_path != '') {
</span><span class="cx"> $p_entry['filename'] = $p_path."/".$p_entry['filename'];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Check a base_dir_restriction
</span><span class="cx"> if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Check the extract directory restriction");
</span><span class="cx"> $v_inclusion
</span><span class="cx"> = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
</span><del>- $p_entry['filename']);
</del><ins>+ $p_entry['filename']);
</ins><span class="cx"> if ($v_inclusion == 0) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_EXTRACT_DIR_RESTRICTION is selected, file is outside restriction");
</span><span class="cx">
</span><span class="lines">@@ -4055,7 +4055,7 @@
</span><span class="cx"> $p_entry['status'] = "skipped";
</span><span class="cx"> $v_result = 1;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for abort result
</span><span class="cx"> if ($v_result == 2) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
</span><span class="lines">@@ -4087,7 +4087,7 @@
</span><span class="cx">
</span><span class="cx"> // ----- Change the file status
</span><span class="cx"> $p_entry['status'] = "already_a_directory";
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
</span><span class="cx"> // For historical reason first PclZip implementation does not stop
</span><span class="cx"> // when this kind of error occurs.
</span><span class="lines">@@ -4172,10 +4172,10 @@
</span><span class="cx">
</span><span class="cx"> if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to create path for '".$p_entry['filename']."'");
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Change the file status
</span><span class="cx"> $p_entry['status'] = "path_creation_fail";
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Return
</span><span class="cx"> ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> //return $v_result;
</span><span class="lines">@@ -4220,7 +4220,7 @@
</span><span class="cx"> $v_binary_data = pack('a'.$v_read_size, $v_buffer);
</span><span class="cx"> @fwrite($v_dest_file, $v_binary_data, $v_read_size);
</span><span class="cx"> */
</span><del>- @fwrite($v_dest_file, $v_buffer, $v_read_size);
</del><ins>+ @fwrite($v_dest_file, $v_buffer, $v_read_size);
</ins><span class="cx"> $v_size -= $v_read_size;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4229,8 +4229,8 @@
</span><span class="cx">
</span><span class="cx"> // ----- Change the file mtime
</span><span class="cx"> touch($p_entry['filename'], $p_entry['mtime']);
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file (Compression method ".$p_entry['compression'].")");
</span><span class="lines">@@ -4245,7 +4245,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> // ----- Look for using temporary file to unzip
</span><del>- if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
</del><ins>+ if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
</ins><span class="cx"> && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
</span><span class="cx"> || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
</span><span class="cx"> && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
</span><span class="lines">@@ -4254,47 +4254,47 @@
</span><span class="cx"> return $v_result;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for extract in memory
</span><span class="cx"> else {
</span><span class="cx">
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read '".$p_entry['compressed_size']."' compressed bytes");
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Read the compressed file in a buffer (one shot)
</span><span class="cx"> $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Decompress the file
</span><span class="cx"> $v_file_content = @gzinflate($v_buffer);
</span><span class="cx"> unset($v_buffer);
</span><span class="cx"> if ($v_file_content === FALSE) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to inflate compressed file");
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Change the file status
</span><span class="cx"> // TBC
</span><span class="cx"> $p_entry['status'] = "error";
</span><del>-
</del><ins>+
</ins><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Opening destination file
</span><span class="cx"> if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Error while opening '".$p_entry['filename']."' in write binary mode");
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Change the file status
</span><span class="cx"> $p_entry['status'] = "write_error";
</span><del>-
</del><ins>+
</ins><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Write the uncompressed data
</span><span class="cx"> @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
</span><span class="cx"> unset($v_file_content);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Closing the destination file
</span><span class="cx"> @fclose($v_dest_file);
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ----- Change the file mtime
</span><span class="lines">@@ -4317,7 +4317,7 @@
</span><span class="cx"> if ($p_entry['status'] == "aborted") {
</span><span class="cx"> $p_entry['status'] = "skipped";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for post-extract callback
</span><span class="cx"> elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the extraction");
</span><span class="lines">@@ -4354,7 +4354,7 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFileUsingTempFile', "filename='".$p_entry['filename']."'");
</span><span class="cx"> $v_result=1;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Creates a temporary file
</span><span class="cx"> $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
</span><span class="cx"> if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
</span><span class="lines">@@ -4426,7 +4426,7 @@
</span><span class="cx">
</span><span class="cx"> // ----- Delete the temporary file
</span><span class="cx"> @unlink($v_gzip_temp_name);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Return
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="lines">@@ -4515,7 +4515,7 @@
</span><span class="cx">
</span><span class="cx"> // ----- Read the compressed file in a buffer (one shot)
</span><span class="cx"> $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Decompress the file
</span><span class="cx"> $v_file_content = gzinflate($v_buffer);
</span><span class="cx"> unset($v_buffer);
</span><span class="lines">@@ -4604,7 +4604,7 @@
</span><span class="cx">
</span><span class="cx"> // ----- Reading the file
</span><span class="cx"> $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Decompress the file
</span><span class="cx"> if (($p_string = @gzinflate($v_data)) === FALSE) {
</span><span class="cx"> // TBC
</span><span class="lines">@@ -4921,7 +4921,7 @@
</span><span class="cx"> if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "filename_len" : TBC To Be Completed');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for flag bit 3
</span><span class="cx"> if (($p_local_header['flag'] & 8) == 8) {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Purpose bit flag bit 3 set !');
</span><span class="lines">@@ -5026,9 +5026,9 @@
</span><span class="cx">
</span><span class="cx"> // ----- Add the byte
</span><span class="cx"> // $v_bytes = ($v_bytes << 8) | Ord($v_byte);
</span><del>- // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
- // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
- $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
</del><ins>+ // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+ // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+ $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
</ins><span class="cx">
</span><span class="cx"> // ----- Compare the bytes
</span><span class="cx"> if ($v_bytes == 0x504b0506)
</span><span class="lines">@@ -5363,7 +5363,7 @@
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span><span class="cx"> return $v_result;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Check that local file header is same as central file header
</span><span class="cx"> if ($this->privCheckFileHeaders($v_local_header,
</span><span class="cx"> $v_header_list[$i]) != 1) {
</span><span class="lines">@@ -5456,11 +5456,11 @@
</span><span class="cx"> // TBC : I should test the result ...
</span><span class="cx"> //@rename($v_zip_temp_name, $this->zipname);
</span><span class="cx"> PclZipUtilRename($v_zip_temp_name, $this->zipname);
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Destroy the temporary archive
</span><span class="cx"> unset($v_temp_zip);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Remove every files : reset the file
</span><span class="cx"> else if ($v_central_dir['entries'] != 0) {
</span><span class="cx"> $this->privCloseFd();
</span><span class="lines">@@ -6008,7 +6008,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for skip
</span><span class="cx"> if ($v_skip > 0) {
</span><span class="cx"> while ($v_skip > 0) {
</span><span class="lines">@@ -6043,7 +6043,7 @@
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilPathInclusion", "dir='$p_dir', path='$p_path'");
</span><span class="cx"> $v_result = 1;
</span><del>-
</del><ins>+
</ins><span class="cx"> // ----- Look for path beginning by ./
</span><span class="cx"> if ( ($p_dir == '.')
</span><span class="cx"> || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
</span><span class="lines">@@ -6234,7 +6234,7 @@
</span><span class="cx"> function PclZipUtilOptionText($p_option)
</span><span class="cx"> {
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilOptionText", "option='".$p_option."'");
</span><del>-
</del><ins>+
</ins><span class="cx"> $v_list = get_defined_constants();
</span><span class="cx"> for (reset($v_list); $v_key = key($v_list); next($v_list)) {
</span><span class="cx"> $v_prefix = substr($v_key, 0, 10);
</span><span class="lines">@@ -6246,7 +6246,7 @@
</span><span class="cx"> return $v_key;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $v_result = 'Unknown';
</span><span class="cx">
</span><span class="cx"> //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-direct.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-direct.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/class-wp-filesystem-direct.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> var $errors = null;
</span><span class="cx"> /**
</span><span class="cx"> * constructor
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param $arg mixed ingored argument
</span><span class="cx"> */
</span><span class="cx"> function WP_Filesystem_Direct($arg) {
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * connect filesystem.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @return bool Returns true on success or false on failure (always true for WP_Filesystem_Direct).
</span><span class="cx"> */
</span><span class="cx"> function connect() {
</span><span class="lines">@@ -35,26 +35,26 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Reads entire file into a string
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param $file string Name of the file to read.
</span><del>- * @return string|bool The function returns the read data or false on failure.
</del><ins>+ * @return string|bool The function returns the read data or false on failure.
</ins><span class="cx"> */
</span><span class="cx"> function get_contents($file) {
</span><span class="cx"> return @file_get_contents($file);
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Reads entire file into an array
</span><del>- *
- * @param $file string Path to the file.
- * @return array|bool the file contents in an array or false on failure.
</del><ins>+ *
+ * @param $file string Path to the file.
+ * @return array|bool the file contents in an array or false on failure.
</ins><span class="cx"> */
</span><span class="cx"> function get_contents_array($file) {
</span><span class="cx"> return @file($file);
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Write a string to a file
</span><del>- *
- * @param $file string Path to the file where to write the data.
</del><ins>+ *
+ * @param $file string Path to the file where to write the data.
</ins><span class="cx"> * @param $contents string The data to write.
</span><span class="cx"> * @param $mode int (optional) The file permissions as octal number, usually 0644.
</span><span class="cx"> * @param $type string (optional) Specifies additional type of access you require to the file.
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Gets the current working directory
</span><del>- *
- * @return string|bool the current working directory on success, or false on failure.
</del><ins>+ *
+ * @return string|bool the current working directory on success, or false on failure.
</ins><span class="cx"> */
</span><span class="cx"> function cwd() {
</span><span class="cx"> return @getcwd();
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Change directory
</span><span class="cx"> *
</span><del>- * @param $dir string The new current directory.
</del><ins>+ * @param $dir string The new current directory.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chdir($dir) {
</span><span class="lines">@@ -87,10 +87,10 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Changes file group
</span><del>- *
- * @param $file string Path to the file.
</del><ins>+ *
+ * @param $file string Path to the file.
</ins><span class="cx"> * @param $group mixed A group name or number.
</span><del>- * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
</del><ins>+ * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chgrp($file, $group, $recursive = false) {
</span><span class="lines">@@ -110,10 +110,10 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Changes filesystem permissions
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param $file string Path to the file.
</span><span class="cx"> * @param $mode int (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
</span><del>- * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
</del><ins>+ * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chmod($file, $mode = false, $recursive = false) {
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> elseif ( $this->is_dir($file) )
</span><span class="cx"> $mode = FS_CHMOD_DIR;
</span><span class="cx"> else
</span><del>- return false;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $recursive )
</span><span class="lines">@@ -143,10 +143,10 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Changes file owner
</span><del>- *
- * @param $file string Path to the file.
</del><ins>+ *
+ * @param $file string Path to the file.
</ins><span class="cx"> * @param $owner mixed A user name or number.
</span><del>- * @param $recursive bool (optional) If set True changes file owner recursivly. Defaults to False.
</del><ins>+ * @param $recursive bool (optional) If set True changes file owner recursivly. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chown($file, $owner, $recursive = false) {
</span><span class="lines">@@ -165,8 +165,8 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Gets file owner
</span><del>- *
- * @param $file string Path to the file.
</del><ins>+ *
+ * @param $file string Path to the file.
</ins><span class="cx"> * @return string Username of the user.
</span><span class="cx"> */
</span><span class="cx"> function owner($file) {
</span><span class="lines">@@ -180,10 +180,10 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Gets file permissions
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * FIXME does not handle errors in fileperms()
</span><del>- *
- * @param $file string Path to the file.
</del><ins>+ *
+ * @param $file string Path to the file.
</ins><span class="cx"> * @return string Mode of the file (last 4 digits).
</span><span class="cx"> */
</span><span class="cx"> function getchmod($file) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> elseif ( $this->is_dir($file) )
</span><span class="cx"> $mode = FS_CHMOD_DIR;
</span><span class="cx"> else
</span><del>- return false;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $recursive || ! $this->is_dir($file) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpsocketsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> elseif ( $this->is_dir($file) )
</span><span class="cx"> $mode = FS_CHMOD_DIR;
</span><span class="cx"> else
</span><del>- return false;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $recursive || ! $this->is_dir($file) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemssh2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ssh2.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ssh2.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/class-wp-filesystem-ssh2.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> elseif ( $this->is_dir($file) )
</span><span class="cx"> $mode = FS_CHMOD_DIR;
</span><span class="cx"> else
</span><del>- return false;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $recursive || ! $this->is_dir($file) )
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx"> $this->skin->after();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $r = $current->response[ $theme ];
</span><span class="cx">
</span><span class="cx"> add_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
</span><span class="lines">@@ -1006,10 +1006,10 @@
</span><span class="cx"> $name = $theme_info['Name'];
</span><span class="cx"> $stylesheet = $this->upgrader->result['destination_name'];
</span><span class="cx"> $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
</span><del>-
</del><ins>+
</ins><span class="cx"> $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
</span><span class="cx"> $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
</span><del>-
</del><ins>+
</ins><span class="cx"> $update_actions = array(
</span><span class="cx"> 'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',
</span><span class="cx"> 'activate' => '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>',
</span></span></pre></div>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/export.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> // Don't export revisions. They bloat the export.
</span><span class="cx"> if ( 'revision' == $post->post_type )
</span><span class="cx"> continue;
</span><del>- setup_postdata($post);
</del><ins>+ setup_postdata($post);
</ins><span class="cx">
</span><span class="cx"> $is_sticky = 0;
</span><span class="cx"> if ( is_sticky( $post->ID ) )
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/file.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> $abstraction_file = apply_filters('filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method);
</span><span class="cx"> if( ! file_exists($abstraction_file) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> require_once($abstraction_file);
</span><span class="cx"> }
</span><span class="cx"> $method = "WP_Filesystem_$method";
</span></span></pre></div>
<a id="trunkwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image-edit.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image-edit.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/image-edit.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> <div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>)" class="imgedit-fliph" title="<?php echo esc_attr__( 'Flip horizontally' ); ?>"></div>
</span><span class="cx"> <div onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>)" class="imgedit-flipv" title="<?php echo esc_attr__( 'Flip vertically' ); ?>"></div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>)" class="imgedit-undo disabled" title="<?php echo esc_attr__( 'Undo' ); ?>"></div>
</span><span class="cx"> <div id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>)" class="imgedit-redo disabled" title="<?php echo esc_attr__( 'Redo' ); ?>"></div>
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/plugin.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $menu[$position] = $new_menu;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $_registered_pages[$hookname] = true;
</span><span class="cx">
</span><span class="cx"> return $hookname;
</span><span class="lines">@@ -623,17 +623,17 @@
</span><span class="cx">
</span><span class="cx"> function add_object_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
</span><span class="cx"> global $_wp_last_object_menu;
</span><del>-
</del><ins>+
</ins><span class="cx"> $_wp_last_object_menu++;
</span><del>-
</del><ins>+
</ins><span class="cx"> return add_menu_page($page_title, $menu_title, $access_level, $file, $function, $icon_url, $_wp_last_object_menu);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function add_utility_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
</span><span class="cx"> global $_wp_last_utility_menu;
</span><del>-
</del><ins>+
</ins><span class="cx"> $_wp_last_utility_menu++;
</span><del>-
</del><ins>+
</ins><span class="cx"> return add_menu_page($page_title, $menu_title, $access_level, $file, $function, $icon_url, $_wp_last_utility_menu);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -674,7 +674,7 @@
</span><span class="cx">
</span><span class="cx"> $_registered_pages[$hookname] = true;
</span><span class="cx"> // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php
</span><del>- if ( 'tools.php' == $parent )
</del><ins>+ if ( 'tools.php' == $parent )
</ins><span class="cx"> $_registered_pages[get_plugin_page_hookname( $file, 'edit.php')] = true;
</span><span class="cx">
</span><span class="cx"> return $hookname;
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/post.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -1078,7 +1078,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Outputs the notice message to say that someone else is editing this post at the moment.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.9.0
</span><span class="cx"> * @return none
</span><span class="cx"> */
</span><span class="lines">@@ -1086,7 +1086,7 @@
</span><span class="cx"> global $post;
</span><span class="cx"> $last_user = get_userdata( get_post_meta( $post->ID, '_edit_last', true ) );
</span><span class="cx"> $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
</span><del>-
</del><ins>+
</ins><span class="cx"> switch ($post->post_type) {
</span><span class="cx"> case 'post':
</span><span class="cx"> $message = __( 'Warning: %s is currently editing this post' );
</span><span class="lines">@@ -1097,9 +1097,9 @@
</span><span class="cx"> default:
</span><span class="cx"> $message = __( 'Warning: %s is currently editing this.' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $message = sprintf( $message, esc_html( $last_user_name ) );
</span><del>- echo "<div class='error'><p>$message</p></div>";
</del><ins>+ echo "<div class='error'><p>$message</p></div>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/includes/template.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -2065,7 +2065,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $query .= "AND $approved $post $typesql";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $comments = $wpdb->get_results("SELECT * $query $orderby");
</span><span class="cx"> if ( '' === $total )
</span><span class="cx"> $total = $wpdb->get_var("SELECT COUNT(c.comment_ID) $query");
</span></span></pre></div>
<a id="trunkwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/install.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/install.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/install.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> if ( isset($_POST) && !empty($_POST) ) {
</span><span class="cx"> $blog_public = isset($_POST['blog_public']);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! is_null( $error ) ) {
</span><span class="cx"> ?>
</span><span class="cx"> <p><?php printf( __('<strong>ERROR</strong>: %s'), $error); ?></p>
</span></span></pre></div>
<a id="trunkwpadminmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/media.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn&#8217;t exist. Perhaps it was deleted?') );
</span><span class="cx"> if ( $att->post_status == 'trash' ) wp_die( __('You can&#8217;t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
</span><del>-
</del><ins>+
</ins><span class="cx"> add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'wp-ajax-response' );
</span></span></pre></div>
<a id="trunkwpadminmenuheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu-header.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu-header.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/menu-header.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) {
</span><span class="cx"> // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
</span><del>-
</del><ins>+
</ins><span class="cx"> $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($menu_file);
</span><span class="cx"> if ( $parent_exists )
</span><span class="cx"> echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/plugins.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> case 'activate-selected':
</span><span class="cx"> if ( ! current_user_can('activate_plugins') )
</span><span class="cx"> wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
</span><del>-
</del><ins>+
</ins><span class="cx"> check_admin_referer('bulk-manage-plugins');
</span><span class="cx">
</span><span class="cx"> $plugins = (array) $_POST['checked'];
</span></span></pre></div>
<a id="trunkwpadminupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upgrade.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upgrade.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/upgrade.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 1:
</span><span class="cx"> wp_upgrade();
</span><del>-
</del><ins>+
</ins><span class="cx"> $backto = empty($_GET['backto']) ? '' : $_GET['backto'] ;
</span><span class="cx"> $backto = stripslashes( urldecode( $backto ) );
</span><span class="cx"> $backto = esc_url_raw( $backto );
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/upload.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> } elseif ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
</span><span class="cx"> check_admin_referer('bulk-media');
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
</span><span class="cx"> $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
</span><span class="cx"> $doaction = 'delete';
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
</span><span class="cx"> } else
</span><span class="cx"> wp_redirect($_SERVER['HTTP_REFERER']);
</span><del>-
</del><ins>+
</ins><span class="cx"> $location = 'upload.php';
</span><span class="cx"> if ( $referer = wp_get_referer() ) {
</span><span class="cx"> if ( false !== strpos($referer, 'upload.php') )
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> foreach( (array) $post_ids as $post_id ) {
</span><span class="cx"> if ( !current_user_can('delete_post', $post_id) )
</span><span class="cx"> wp_die( __('You are not allowed to move this post to the trash.') );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !wp_trash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in moving to trash...') );
</span><span class="cx"> }
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> foreach( (array) $post_ids as $post_id ) {
</span><span class="cx"> if ( !current_user_can('delete_post', $post_id) )
</span><span class="cx"> wp_die( __('You are not allowed to move this post out of the trash.') );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !wp_untrash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in restoring from trash...') );
</span><span class="cx"> }
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> foreach( (array) $post_ids as $post_id_del ) {
</span><span class="cx"> if ( !current_user_can('delete_post', $post_id_del) )
</span><span class="cx"> wp_die( __('You are not allowed to delete this post.') );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !wp_delete_attachment($post_id_del) )
</span><span class="cx"> wp_die( __('Error in deleting...') );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-admin/user-edit.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label for="<?php echo $name; ?>"><?php echo apply_filters('user_'.$name.'_label', $desc); ?></label></th>
</span><span class="cx"> <td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
</span><del>-</tr>
</del><ins>+</tr>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-app.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $location = get_post_meta($entry['ID'], '_wp_attached_file', true);
</span><del>- $location = get_option ('upload_path') . '/' . $location;
</del><ins>+ $location = get_option ('upload_path') . '/' . $location;
</ins><span class="cx"> $filetype = wp_check_filetype($location);
</span><span class="cx">
</span><span class="cx"> if(!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
</span><span class="lines">@@ -791,9 +791,9 @@
</span><span class="cx"> header('Content-Type: ' . $entry['post_mime_type']);
</span><span class="cx"> header('Connection: close');
</span><span class="cx">
</span><del>- if ($fp = fopen($location, "rb")) {
- status_header('200');
- header('Content-Type: ' . $entry['post_mime_type']);
</del><ins>+ if ($fp = fopen($location, "rb")) {
+ status_header('200');
+ header('Content-Type: ' . $entry['post_mime_type']);
</ins><span class="cx"> header('Connection: close');
</span><span class="cx">
</span><span class="cx"> while(!feof($fp)) {
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/canonical.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -95,8 +95,8 @@
</span><span class="cx"> $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
</span><span class="cx"> }
</span><span class="cx"> } elseif ( is_single() && !empty($_GET['name']) && ! $redirect_url ) {
</span><del>- if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
- $redirect['query'] = remove_query_arg('name', $redirect['query']);
</del><ins>+ if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
+ $redirect['query'] = remove_query_arg('name', $redirect['query']);
</ins><span class="cx"> } elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
</span><span class="cx"> if ( $redirect_url = get_permalink(get_query_var('page_id')) )
</span><span class="cx"> $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
</span></span></pre></div>
<a id="trunkwpincludesclassjsonphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-json.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-json.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/class-json.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> */
</span><span class="cx"> function _encode($var)
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> switch (gettype($var)) {
</span><span class="cx"> case 'boolean':
</span><span class="cx"> return $var ? 'true' : 'false';
</span></span></pre></div>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/classes.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> // Trim the query of everything up to the '?'.
</span><span class="cx"> $query = preg_replace("!^.+\?!", '', $query);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Substitute the substring matches into the query.
</span><span class="cx"> $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
</span><span class="cx">
</span><span class="lines">@@ -1594,59 +1594,59 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Helper class to remove the need to use eval to replace $matches[] in query strings.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.9.0
</span><span class="cx"> */
</span><span class="cx"> class WP_MatchesMapRegex {
</span><span class="cx"> /**
</span><span class="cx"> * store for matches
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access private
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><span class="cx"> var $_matches;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * store for mapping result
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><span class="cx"> var $output;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * subject to perform mapping on (query string containing $matches[] references
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access private
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><span class="cx"> var $_subject;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><del>- * regexp pattern to match $matches[] references
- *
</del><ins>+ * regexp pattern to match $matches[] references
+ *
</ins><span class="cx"> * @var string
</span><span class="cx"> */
</span><span class="cx"> var $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * constructor
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $subject subject if regex
</span><span class="cx"> * @param array $matches data to use in map
</span><span class="cx"> * @return self
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function WP_MatchesMapRegex($subject, $matches) {
</span><span class="cx"> $this->_subject = $subject;
</span><span class="cx"> $this->_matches = $matches;
</span><del>- $this->output = $this->_map();
</del><ins>+ $this->output = $this->_map();
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Substitute substring matches in subject.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * static helper function to ease use
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access public
</span><span class="cx"> * @param string $subject subject
</span><span class="cx"> * @param array $matches data used for subsitution
</span><span class="lines">@@ -1654,12 +1654,12 @@
</span><span class="cx"> */
</span><span class="cx"> function apply($subject, $matches) {
</span><span class="cx"> $oSelf =& new WP_MatchesMapRegex($subject, $matches);
</span><del>- return $oSelf->output;
</del><ins>+ return $oSelf->output;
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><del>- * do the actual mapping
- *
</del><ins>+ * do the actual mapping
+ *
</ins><span class="cx"> * @access private
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="lines">@@ -1667,10 +1667,10 @@
</span><span class="cx"> $callback = array(&$this, 'callback');
</span><span class="cx"> return preg_replace_callback($this->_pattern, $callback, $this->_subject);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * preg_replace_callback hook
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access public
</span><span class="cx"> * @param array $matches preg_replace regexp matches
</span><span class="cx"> * @return string
</span><span class="lines">@@ -1679,7 +1679,7 @@
</span><span class="cx"> $index = intval(substr($matches[0], 9, -1));
</span><span class="cx"> return ( isset( $this->_matches[$index] ) ? $this->_matches[$index] : '' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/comment-template.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -835,12 +835,12 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * The email address of the current comment author escaped for use in attributes.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> $comment_author_email = $commenter['comment_author_email']; // Escaped by sanitize_comment_cookies()
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * The url of the current comment author escaped for use in attributes.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> $comment_author_url = esc_url($commenter['comment_author_url']);
</span><span class="cx">
</span><span class="cx"> /** @todo Use API instead of SELECTs. */
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/comment.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -734,9 +734,9 @@
</span><span class="cx">
</span><span class="cx"> if (wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0)
</span><span class="cx"> return wp_trash_comment($comment_id);
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action('delete_comment', $comment_id);
</span><del>-
</del><ins>+
</ins><span class="cx"> $trash_meta = get_option('wp_trash_meta');
</span><span class="cx"> if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id])) {
</span><span class="cx"> unset($trash_meta['comments'][$comment_id]);
</span><span class="lines">@@ -1093,7 +1093,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> $status = '0';
</span><span class="cx"> switch ( $comment_status ) {
</span><span class="cx"> case 'hold':
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/formatting.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> $curl = '';
</span><span class="cx"> $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
</span><span class="cx"> $stop = count($textarr);
</span><del>-
</del><ins>+
</ins><span class="cx"> /* translators: opening curly quote */
</span><span class="cx"> $opening_quote = _x('&#8220;', 'opening curly quote');
</span><span class="cx"> /* translators: closing curly quote */
</span><span class="cx"> $closing_quote = _x('&#8221;', 'closing curly quote');
</span><del>-
</del><ins>+
</ins><span class="cx"> $no_texturize_tags = apply_filters('no_texturize_tags', array('pre', 'code', 'kbd', 'style', 'script', 'tt'));
</span><span class="cx"> $no_texturize_shortcodes = apply_filters('no_texturize_shortcodes', array('code'));
</span><span class="cx"> $no_texturize_tags_stack = array();
</span><span class="lines">@@ -1326,7 +1326,7 @@
</span><span class="cx"> $smiley = trim(reset($smiley));
</span><span class="cx"> $img = $wpsmiliestrans[$smiley];
</span><span class="cx"> $smiley_masked = esc_attr($smiley);
</span><del>-
</del><ins>+
</ins><span class="cx"> $srcurl = apply_filters('smilies_src', "$siteurl/wp-includes/images/smilies/$img", $img, $siteurl);
</span><span class="cx">
</span><span class="cx"> return " <img src='$srcurl' alt='$smiley_masked' class='wp-smiley' /> ";
</span><span class="lines">@@ -2087,14 +2087,14 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Perform a deep string replace operation to ensure the values in $search are no longer present
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Repeats the replacement operation until it no longer replaces anything so as to remove "nested" values
</span><span class="cx"> * e.g. $subject = '%0%0%0DDD', $search ='%0D', $result ='' rather than the '%0%0DD' that
</span><span class="cx"> * str_replace would return
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.8.1
</span><span class="cx"> * @access private
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string|array $search
</span><span class="cx"> * @param string $subject
</span><span class="cx"> * @return string The processed string
</span><span class="lines">@@ -2110,7 +2110,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $subject;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/functions.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -3308,13 +3308,13 @@
</span><span class="cx"> $display = $zone['t_continent'];
</span><span class="cx"> } else {
</span><span class="cx"> // It's inside a continent group
</span><del>-
</del><ins>+
</ins><span class="cx"> // Continent optgroup
</span><span class="cx"> if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) {
</span><span class="cx"> $label = ( 'Etc' === $zone['continent'] ) ? __( 'Manual offsets' ) : $zone['t_continent'];
</span><span class="cx"> $structure[] = '<optgroup label="'. esc_attr( $label ) .'">';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Add the city to the value
</span><span class="cx"> $value[] = $zone['city'];
</span><span class="cx"> if ( 'Etc' === $zone['continent'] ) {
</span><span class="lines">@@ -3342,7 +3342,7 @@
</span><span class="cx"> $selected = 'selected="selected" ';
</span><span class="cx"> }
</span><span class="cx"> $structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
</span><del>-
</del><ins>+
</ins><span class="cx"> // Close continent optgroup
</span><span class="cx"> if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) {
</span><span class="cx"> $structure[] = '</optgroup>';
</span><span class="lines">@@ -3364,7 +3364,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Permanently deletes posts, pages, attachments, and comments which have been in the trash for EMPTY_TRASH_DAYS.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><span class="cx"> * @return void
</span><span class="lines">@@ -3373,15 +3373,15 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
</span><del>-
</del><ins>+
</ins><span class="cx"> $posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( (array) $posts_to_delete as $post ) {
</span><span class="cx"> wp_delete_post($post['post_id']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //Trashed Comments
</span><del>- //TODO Come up with a better store for the comment trash meta.
</del><ins>+ //TODO Come up with a better store for the comment trash meta.
</ins><span class="cx"> $trash_meta = get_option('wp_trash_meta');
</span><span class="cx"> if ( !is_array($trash_meta) )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpincludeshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/http.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/http.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/http.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -1813,10 +1813,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Decompression of deflated string while staying compatible with the majority of servers.
</span><span class="cx"> *
</span><del>- * Certain Servers will return deflated data with headers which PHP's gziniflate()
</del><ins>+ * Certain Servers will return deflated data with headers which PHP's gziniflate()
</ins><span class="cx"> * function cannot handle out of the box. The following function lifted from
</span><del>- * http://au2.php.net/manual/en/function.gzinflate.php#77336 will attempt to deflate
- * the various return forms used.
</del><ins>+ * http://au2.php.net/manual/en/function.gzinflate.php#77336 will attempt to deflate
+ * the various return forms used.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.8.1
</span><span class="cx"> * @link http://au2.php.net/manual/en/function.gzinflate.php#77336
</span></span></pre></div>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/kses.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -1176,16 +1176,16 @@
</span><span class="cx"> return '';
</span><span class="cx">
</span><span class="cx"> $css_array = split( ';', trim( $css ) );
</span><del>- $allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float',
- 'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
</del><ins>+ $allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float',
+ 'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
</ins><span class="cx"> 'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left',
</span><del>- 'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
- 'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top',
- 'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side',
- 'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style',
- 'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom',
- 'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
- 'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
</del><ins>+ 'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
+ 'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top',
+ 'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side',
+ 'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style',
+ 'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom',
+ 'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
+ 'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
</ins><span class="cx"> 'width' ) );
</span><span class="cx">
</span><span class="cx"> if ( empty($allowed_attr) )
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/link-template.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -1648,10 +1648,10 @@
</span><span class="cx"> */
</span><span class="cx"> function get_shortcut_link() {
</span><span class="cx"> $link = "javascript:
</span><del>- var d=document,
- w=window,
- e=w.getSelection,
- k=d.getSelection,
</del><ins>+ var d=document,
+ w=window,
+ e=w.getSelection,
+ k=d.getSelection,
</ins><span class="cx"> x=d.selection,
</span><span class="cx"> s=(e?e():(k)?k():(x?x.createRange().text:0)),
</span><span class="cx"> f='" . admin_url('press-this.php') . "',
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/media.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> $newimage = wp_imagecreatetruecolor( $dst_w, $dst_h );
</span><span class="cx">
</span><span class="cx"> imagecopyresampled( $newimage, $image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
</span><del>-
</del><ins>+
</ins><span class="cx"> // convert from full colors to index colors, like original PNG.
</span><span class="cx"> if ( IMAGETYPE_PNG == $orig_type && !imageistruecolor( $image ) )
</span><span class="cx"> imagetruecolortopalette( $newimage, false, imagecolorstotal( $image ) );
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> // all other formats are converted to jpg
</span><span class="cx"> $destfilename = "{$dir}/{$name}-{$suffix}.jpg";
</span><del>- if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
</del><ins>+ if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
</ins><span class="cx"> return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -837,7 +837,7 @@
</span><span class="cx"> return function_exists('imagecreatefrompng');
</span><span class="cx"> case 'image/gif':
</span><span class="cx"> return function_exists('imagecreatefromgif');
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/pluggable.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -998,7 +998,7 @@
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="cx"> $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
</span><span class="cx"> $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
</span><del>- /* translators: 1: blog name, 2: post title */
</del><ins>+ /* translators: 1: blog name, 2: post title */
</ins><span class="cx"> $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
</span><span class="cx"> } elseif ('pingback' == $comment_type) {
</span><span class="cx"> /* translators: 1: post id, 2: post title */
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/post.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><span class="cx"> $children = get_posts( $r );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$children )
</span><span class="cx"> return $kids;
</span><span class="cx">
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $meta_key, $meta_value ) );
</span><span class="cx">
</span><span class="cx"> wp_cache_delete($post_id, 'post_meta');
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action( 'deleted_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -672,12 +672,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'update_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
</span><del>-
</del><ins>+
</ins><span class="cx"> $wpdb->update( $wpdb->postmeta, $data, $where );
</span><span class="cx"> wp_cache_delete($post_id, 'post_meta');
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action( 'updated_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1154,12 +1154,12 @@
</span><span class="cx">
</span><span class="cx"> if ( ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS > 0 )
</span><span class="cx"> return wp_trash_post($postid);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $post->post_type == 'attachment' )
</span><span class="cx"> return wp_delete_attachment($postid);
</span><span class="cx">
</span><span class="cx"> do_action('delete_post', $postid);
</span><del>-
</del><ins>+
</ins><span class="cx"> delete_post_meta($postid,'_wp_trash_meta_status');
</span><span class="cx"> delete_post_meta($postid,'_wp_trash_meta_time');
</span><span class="cx">
</span><span class="lines">@@ -1819,14 +1819,14 @@
</span><span class="cx"> function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent) {
</span><span class="cx"> if ( in_array( $post_status, array( 'draft', 'pending' ) ) )
</span><span class="cx"> return $slug;
</span><del>-
</del><ins>+
</ins><span class="cx"> global $wpdb, $wp_rewrite;
</span><span class="cx"> $hierarchical_post_types = apply_filters('hierarchical_post_types', array('page'));
</span><span class="cx"> if ( 'attachment' == $post_type ) {
</span><span class="cx"> // Attachment slugs must be unique across all types.
</span><span class="cx"> $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
</span><span class="cx"> $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
</span><span class="cx"> $suffix = 2;
</span><span class="cx"> do {
</span><span class="lines">@@ -1841,7 +1841,7 @@
</span><span class="cx"> // separate namespace than posts so page slugs are allowed to overlap post slugs.
</span><span class="cx"> $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode("', '", $wpdb->escape($hierarchical_post_types)) . "' ) AND ID != %d AND post_parent = %d LIMIT 1";
</span><span class="cx"> $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID, $post_parent));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
</span><span class="cx"> $suffix = 2;
</span><span class="cx"> do {
</span><span class="lines">@@ -1855,7 +1855,7 @@
</span><span class="cx"> // Post slugs must be unique across all posts.
</span><span class="cx"> $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
</span><span class="cx"> $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
</span><span class="cx"> $suffix = 2;
</span><span class="cx"> do {
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/query.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -2697,7 +2697,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action_ref_array('the_post', array(&$post));
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesregistrationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/registration.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/registration.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/registration.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> * Setup the default contact methods
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span><del>- * @since
</del><ins>+ * @since
</ins><span class="cx"> *
</span><span class="cx"> * @return array $user_contactmethods Array of contact methods and their labels.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/script-loader.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx">
</span><span class="cx"> // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
</span><span class="cx"> $styles->add( 'colors', true, array(), $colors_version );
</span><del>-
</del><ins>+
</ins><span class="cx"> // do not refer to these directly, the right one is queued by the above "meta" colors handle
</span><span class="cx"> $styles->add( 'colors-fresh', "/wp-admin/css/colors-fresh$suffix.css", array(), $colors_version);
</span><span class="cx"> $styles->add_data( 'colors-fresh', 'rtl', true );
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/theme.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -604,13 +604,13 @@
</span><span class="cx"> $category = get_category( $cat_ID );
</span><span class="cx">
</span><span class="cx"> $templates = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !is_wp_error($category) )
</span><span class="cx"> $templates[] = "category-{$category->slug}.php";
</span><span class="cx">
</span><span class="cx"> $templates[] = "category-$cat_ID.php";
</span><del>- $templates[] = "category.php";
-
</del><ins>+ $templates[] = "category.php";
+
</ins><span class="cx"> $template = locate_template($templates);
</span><span class="cx"> return apply_filters('category_template', $template);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/user.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx">
</span><span class="cx"> wp_cache_delete($user_id, 'users');
</span><span class="cx">
</span><del>- if ( !$cur )
</del><ins>+ if ( !$cur )
</ins><span class="cx"> do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
</span><span class="cx"> else
</span><span class="cx"> do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-includes/wp-db.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> */
</span><span class="cx"> var $old_tables = array('categories', 'post2cat', 'link2cat');
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Format specifiers for DB columns. Columns not listed here default to %s. Initialized in wp-settings.php.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (11929 => 11930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2009-09-14 13:57:48 UTC (rev 11929)
+++ trunk/wp-login.php 2009-09-14 14:03:32 UTC (rev 11930)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx">
</span><span class="cx"> if ( $is_iphone ) {
</span><span class="cx"> ?>
</span><del>- <meta name="viewport" content="width=320; initial-scale=0.9; maximum-scale=1.0; user-scalable=0;" />
- <style type="text/css" media="screen">
</del><ins>+ <meta name="viewport" content="width=320; initial-scale=0.9; maximum-scale=1.0; user-scalable=0;" />
+ <style type="text/css" media="screen">
</ins><span class="cx"> form { margin-left: 0px; }
</span><span class="cx"> #login { margin-top: 20px; }
</span><span class="cx"> </style>
</span></span></pre>
</div>
</div>
</body>
</html>