<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[GlotPress][711] trunk: Remove trailing whitespace</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/711">711</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2012-10-30 23:29:25 +0000 (Tue, 30 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesformatsformat_rrcphp">trunk/gp-includes/formats/format_rrc.php</a></li>
<li><a href="#trunkgpincludesformatsformat_stringsphp">trunk/gp-includes/formats/format_strings.php</a></li>
<li><a href="#trunkgpincludesinstallupgradephp">trunk/gp-includes/install-upgrade.php</a></li>
<li><a href="#trunkgpincludeslambdaphp">trunk/gp-includes/lambda.php</a></li>
<li><a href="#trunkgpincludesmiscphp">trunk/gp-includes/misc.php</a></li>
<li><a href="#trunkgpincludespluginphp">trunk/gp-includes/plugin.php</a></li>
<li><a href="#trunkgpincludesroutesoriginalphp">trunk/gp-includes/routes/original.php</a></li>
<li><a href="#trunkgpincludesroutestranslationsetphp">trunk/gp-includes/routes/translation-set.php</a></li>
<li><a href="#trunkgpincludesthingsprojectphp">trunk/gp-includes/things/project.php</a></li>
<li><a href="#trunkgpincludesthingstranslationsetphp">trunk/gp-includes/things/translation-set.php</a></li>
<li><a href="#trunkgpincludesthingstranslationphp">trunk/gp-includes/things/translation.php</a></li>
<li><a href="#trunkgpincludesthingsuserphp">trunk/gp-includes/things/user.php</a></li>
<li><a href="#trunkgpincludesurlphp">trunk/gp-includes/url.php</a></li>
<li><a href="#trunkgpincludeswpformattingphp">trunk/gp-includes/wp-formatting.php</a></li>
<li><a href="#trunkgpsettingsphp">trunk/gp-settings.php</a></li>
<li><a href="#trunkgptemplatesheaderphp">trunk/gp-templates/header.php</a></li>
<li><a href="#trunkgptemplateshelperfunctionsphp">trunk/gp-templates/helper-functions.php</a></li>
<li><a href="#trunkgptemplatesinstallphp">trunk/gp-templates/install.php</a></li>
<li><a href="#trunkgptemplatestranslationsphp">trunk/gp-templates/translations.php</a></li>
<li><a href="#trunkpomomophp">trunk/pomo/mo.php</a></li>
<li><a href="#trunkpomopophp">trunk/pomo/po.php</a></li>
<li><a href="#trunkpomotranslationsphp">trunk/pomo/translations.php</a></li>
<li><a href="#trunkscriptsremovemultiplecurrentsphp">trunk/scripts/remove-multiple-currents.php</a></li>
<li><a href="#trunktbinrequestphp">trunk/t/bin/request.php</a></li>
<li><a href="#trunktlibfactoryphp">trunk/t/lib/factory.php</a></li>
<li><a href="#trunktlibtestcaserequestphp">trunk/t/lib/testcase-request.php</a></li>
<li><a href="#trunkttest_requestsphp">trunk/t/test_requests.php</a></li>
<li><a href="#trunkttest_translationsphp">trunk/t/test_translations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesformatsformat_rrcphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_rrc.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_rrc.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/formats/format_rrc.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Escapes a UTF-8 string to be used in RRC file
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Suitable characters are encoded in ISO-8859-1, all non-latin1 unicode
</span><span class="cx"> * characters are encoded via \uXXXX notation, where XXXX is 0-paded hex unicode code-point
</span><span class="cx"> * Newlines, tabs and carriage returns are backslash-escaped.
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_stringsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_strings.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_strings.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/formats/format_strings.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> foreach ( $sorted_entries as $entry ) {
</span><span class="cx"> $original = str_replace( "\n", "\\n", $entry->context );
</span><span class="cx"> $translation = str_replace( "\n", "\\n", empty( $entry->translations ) ? $entry->context : $entry->translations[0] );
</span><del>- $comment = preg_replace( "/(^\s+)|(\s+$)/us", "", $entry->extracted_comments );
</del><ins>+ $comment = preg_replace( "/(^\s+)|(\s+$)/us", "", $entry->extracted_comments );
</ins><span class="cx"> if ( $comment == "" ) {
</span><span class="cx"> $comment = "No comment provided by engineer.";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludesinstallupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/install-upgrade.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/install-upgrade.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/install-upgrade.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx">
</span><span class="cx"> function gp_install() {
</span><span class="cx"> global $gpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> $errors = gp_upgrade_db();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $errors ) return $errors;
</span><span class="cx">
</span><span class="cx"> gp_update_option( 'uri', guess_uri() );
</span></span></pre></div>
<a id="trunkgpincludeslambdaphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/lambda.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/lambda.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/lambda.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Creates a function, which returns $value
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param mixed $value
</span><span class="cx"> */
</span><span class="cx"> function returner( $value ) {
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Creates a function, which prints $value
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param mixed $value
</span><span class="cx"> */
</span><span class="cx"> function echoer( $value ) {
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Creates a function, which accepts $args and returns the expression in $expression.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Items from the optional array $locals can be used as local variables in the function.
</span><span class="cx"> * In case of collision a formal arguments and a key in $locals, the latter will be prefixed
</span><span class="cx"> * with ext_
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $args String with the function arguments
</span><span class="cx"> * @param string $expression String with an expression -- the result of the function
</span><span class="cx"> * @param array $locals The items in this array will be extracted in the function as local variables.
</span></span></pre></div>
<a id="trunkgpincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/misc.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/misc.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/misc.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieves a value from $_POST
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> * Passes the message set through the next redirect.
</span><span class="cx"> *
</span><span class="cx"> * Works best for edit requests, which want to pass error message or notice back to the listing page.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $message The message to be passed
</span><span class="cx"> * @param string $key Optional. Key for the message. You can pass several messages under different keys.
</span><span class="cx"> * A key has one message. The default is 'notice'.
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieves a notice message, set by {@link gp_notice()}
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $key Optional. Message key. The default is 'notice'
</span><span class="cx"> */
</span><span class="cx"> function gp_notice( $key = 'notice' ) {
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Sets headers, which redirect to another page.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $location The path to redirect to
</span><span class="cx"> * @param int $status Status code to use
</span><span class="cx"> * @return bool False if $location is not set
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Builds SQL LIMIT/OFFSET clause for the given page
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param integer $page The page number. The first page is 1.
</span><span class="cx"> * @param integer $per_page How many items are there in a page
</span><span class="cx"> */
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> * Returns an array of arrays, where the i-th array contains the i-th element from
</span><span class="cx"> * each of the argument arrays. The returned array is truncated in length to the length
</span><span class="cx"> * of the shortest argument array.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function works only with numerical arrays.
</span><span class="cx"> */
</span><span class="cx"> function gp_array_zip() {
</span></span></pre></div>
<a id="trunkgpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/plugin.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/plugin.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/plugin.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve an option, specific to your plugin.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * You don't have to prefix the key or to tie its name to your plugin.
</span><span class="cx"> *
</span><span class="cx"> * @param string $key
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Update an option, specific to your plugin.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * You don't have to prefix the key or to tie its name to your plugin.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $key
</span><span class="cx"> * @param mixed $value Can be anything serializable
</span><span class="cx"> * @return bool
</span><span class="lines">@@ -53,14 +53,14 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Adds a method in this class as an action with the same name.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * For example $this->add_action( 'init', ... ) will add $this->init() as an init action
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $action_name The name of the action and the method.
</span><span class="cx"> * @param array $args Two keys are supported:
</span><span class="cx"> * - priority => priority of the action. Positive integer. Lower priority means earlier execution. Default is 10.
</span><span class="cx"> * - args => how many arguments the action accepts. Default is 1.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @see add_action()
</span><span class="cx"> */
</span><span class="cx"> function add_action( $action_name, $args = array() ) {
</span><span class="lines">@@ -69,14 +69,14 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Adds a method in this class as a filter with the same name.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * For example $this->add_filter( 'the_content', ... ) will add $this->the_content() as a the_content filter
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $filter_name The name of the filter and the method.
</span><span class="cx"> * @param array $args Two keys are supported:
</span><span class="cx"> * - priority => priority of the filter. Positive integer. Lower priority means earlier execution. Default is 10.
</span><span class="cx"> * - args => how many arguments the filter accepts. Default is 1.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @see add_action()
</span><span class="cx"> */
</span><span class="cx"> function add_filter( $filter_name, $args = array() ) {
</span></span></pre></div>
<a id="trunkgpincludesroutesoriginalphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/original.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/original.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/routes/original.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_Route_Original extends GP_Route_Main {
</span><del>-
</del><ins>+
</ins><span class="cx"> function set_priority( $original_id ) {
</span><span class="cx"> $original = GP::$original->get( $original_id );
</span><span class="cx"> if ( !$original ) gp_tmpl_404();
</span></span></pre></div>
<a id="trunkgpincludesroutestranslationsetphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/translation-set.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/translation-set.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/routes/translation-set.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> function new_get() {
</span><span class="cx"> $set = new GP_Translation_Set;
</span><span class="cx"> $set->project_id = gp_get( 'project_id' );
</span><del>- $project = $set->project_id? GP::$project->get( $set->project_id ) : null;
</del><ins>+ $project = $set->project_id? GP::$project->get( $set->project_id ) : null;
</ins><span class="cx"> if ( $this->cannot_edit_set_and_redirect( $set ) ) return;
</span><span class="cx"> $this->tmpl( 'translation-set-new', get_defined_vars() );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludesthingsprojectphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/project.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/project.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/things/project.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -127,10 +127,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Gives an array of project objects starting from the current project
</span><span class="cx"> * then its parent, its parent and up to the root
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @todo Cache the results. Invalidation is tricky, because on each project update we need to invalidate the cache
</span><span class="cx"> * for all of its children.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function path_to_root() {
</span></span></pre></div>
<a id="trunkgpincludesthingstranslationsetphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/translation-set.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation-set.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/things/translation-set.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Copies translations from a translation set to the current one
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This function doesn't merge then, just copies unconditionally. If a translation already exists, it will be duplicated.
</span><span class="cx"> */
</span><span class="cx"> function copy_translations_from( $source_translation_set_id ) {
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> SELECT
</span><span class="cx"> original_id, %s AS translation_set_id, translation_0, translation_1, translation_2, user_id, status, date_added, %s AS date_modified, warnings
</span><span class="cx"> FROM $gpdb->translations WHERE translation_set_id = %s", $this->id, $current_date, $source_translation_set_id
</span><del>- );
</del><ins>+ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function percent_translated() {
</span></span></pre></div>
<a id="trunkgpincludesthingstranslationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/translation.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/things/translation.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> 'by' => 'priority',
</span><span class="cx"> 'how' => 'desc'
</span><span class="cx"> );
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $sort_by = gp_array_get( $sort_bys, gp_array_get( $sort, 'by' ), gp_array_get( $sort_bys, $default_sort['by'] ) );
</span><span class="cx"> $sort_hows = array('asc' => 'ASC', 'desc' => 'DESC', );
</span></span></pre></div>
<a id="trunkgpincludesthingsuserphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/user.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/user.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/things/user.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -85,9 +85,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Determines whether the user can do $action on the instance of $object_type with id $object_id.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * If the method is called statically, it uses the current session user.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Example: $user->can( 'read', 'translation-set', 11 );
</span><span class="cx"> */
</span><span class="cx"> function can( $action, $object_type = null, $object_id = null, $extra = null ) {
</span></span></pre></div>
<a id="trunkgpincludesurlphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/url.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/url.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/url.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -16,12 +16,12 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Joins paths, and takes care of slashes between them
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Example: gp_url_join( '/project', array( 'wp', 'dev) ) -> '/project/wp/dev'
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function will keep leading and trailing slashes of the whole URL, but won't
</span><span class="cx"> * allow more than consecutive slash inside.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param mixed components... arbitrary number of string or path components
</span><span class="cx"> * @return string URL, built of all the components, separated with /
</span><span class="cx"> */
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Builds a URL relative to the GlotPress' domain root
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param mixed $path string path or array of path components
</span><span class="cx"> * @param array $query associative array of query arguments (optional)
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkgpincludeswpformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/wp-formatting.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/wp-formatting.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-includes/wp-formatting.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -470,8 +470,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Navigates through an array and encodes the values to be used in a URL.
</span><span class="cx"> *
</span><del>- * Uses a callback to pass the value of the array back to the function as a
- * string.
</del><ins>+ * Uses a callback to pass the value of the array back to the function as a
+ * string.
</ins><span class="cx"> *
</span><span class="cx"> * @since WP 2.2.0
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkgpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-settings.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-settings.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-settings.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * It is possible to define this in wp-config.php and it will be used as the domain for all cookies.
</span><span class="cx"> * Set it carefully for sharing cookies amonst subdomains
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @link http://curl.haxx.se/rfc/cookie_spec.html
</span><span class="cx"> */
</span><span class="cx"> if ( !defined('GP_COOKIE_DOMAIN') )
</span></span></pre></div>
<a id="trunkgptemplatesheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/header.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/header.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-templates/header.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> </a>
</span><span class="cx"> <?php echo gp_breadcrumb(); ?>
</span><span class="cx"> <span id="hello">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> if (GP::$user->logged_in()):
</span><span class="cx"> $user = GP::$user->current();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkgptemplateshelperfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/helper-functions.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/helper-functions.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-templates/helper-functions.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> $disabled = $can_edit? '' : 'disabled="disabled"';
</span><span class="cx"> ?>
</span><span class="cx"> <div class="textareas">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> if( isset( $entry->warnings[$index] ) ):
</span><span class="cx"> $referenceable = $entry->warnings[$index];
</span><span class="cx"> $warning = each( $referenceable );
</span></span></pre></div>
<a id="trunkgptemplatesinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/install.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/install.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-templates/install.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> <pre>
</span><span class="cx"> <?php echo implode("\n", $errors); ?>
</span><span class="cx"> </pre>
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> else:
</span><span class="cx"> echo $success_message;
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunkgptemplatestranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translations.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translations.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/gp-templates/translations.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -94,14 +94,14 @@
</span><span class="cx"> <dl class="filters-expanded sort hidden clearfix">
</span><span class="cx"> <dt><?php _e('By:'); ?></dt>
</span><span class="cx"> <dd>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> $default_sort = GP::$user->current()->get_meta('default_sort');
</span><span class="cx"> if ( ! is_array($default_sort) ) {
</span><span class="cx"> $default_sort = array(
</span><span class="cx"> 'by' => 'priority',
</span><span class="cx"> 'how' => 'desc'
</span><span class="cx"> );
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> echo gp_radio_buttons('sort[by]',
</span><span class="cx"> array(
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> <?php echo gp_pagination( $page, $per_page, $total_translations_count ); ?>
</span><span class="cx"> <div id="legend" class="secondary clearfix">
</span><span class="cx"> <div><strong><?php _e('Legend:'); ?></strong></div>
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> foreach( GP::$translation->get_static( 'statuses' ) as $status ):
</span><span class="cx"> if ( 'rejected' == $status ) continue;
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkpomomophp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/mo.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/mo.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/pomo/mo.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Build a Translation_Entry from original string and translation strings,
</span><span class="cx"> * found in a MO file
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @static
</span><span class="cx"> * @param string $original original string to translate from MO file. Might contain
</span><span class="cx"> * 0x04 as context separator or 0x00 as singular/plural separator
</span></span></pre></div>
<a id="trunkpomopophp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/po.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/po.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/pomo/po.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Text to include as a comment before the start of the PO contents
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Doesn't need to include # in the beginning of lines, these are added automatically
</span><span class="cx"> */
</span><span class="cx"> function set_comment_before_headers( $text ) {
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Gives back the original string from a PO-formatted string
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @static
</span><span class="cx"> * @param string $string PO-formatted string
</span><span class="cx"> * @return string enascaped string
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Inserts $with in the beginning of every new line of $string and
</del><ins>+ * Inserts $with in the beginning of every new line of $string and
</ins><span class="cx"> * returns the modified string
</span><span class="cx"> *
</span><span class="cx"> * @static
</span></span></pre></div>
<a id="trunkpomotranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/translations.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/translations.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/pomo/translations.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Adds parantheses to the inner parts of ternary operators in
</span><span class="cx"> * plural expressions, because PHP evaluates ternary oerators from left to right
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $expression the expression without parentheses
</span><span class="cx"> * @return string the expression with parentheses added
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkscriptsremovemultiplecurrentsphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/remove-multiple-currents.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/remove-multiple-currents.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/scripts/remove-multiple-currents.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> if ( $translation->original_id == $prev_original_id ) {
</span><span class="cx"> echo "Duplicate with original_id#$prev_original_id. Translation#$translation->id\n";
</span><span class="cx"> $translation->delete();
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> $prev_original_id = $translation->original_id;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktbinrequestphp"></a>
<div class="modfile"><h4>Modified: trunk/t/bin/request.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/bin/request.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/t/bin/request.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-$index = dirname( __FILE__ ) . '/../../index.php';
</del><ins>+$index = dirname( __FILE__ ) . '/../../index.php';
</ins><span class="cx">
</span><span class="cx"> require $argv[1];
</span><span class="cx"> $_SERVER['SCRIPT_NAME'] = '/index.php';
</span></span></pre></div>
<a id="trunktlibfactoryphp"></a>
<div class="modfile"><h4>Modified: trunk/t/lib/factory.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/lib/factory.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/t/lib/factory.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Creates a new factory, which will create objects of a specific Thing
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param object $factory GLobal factory that can be used to create other objects on the system
</span><span class="cx"> * @param object $thing Instance of a GP_Thing subclass. This factory will create objects of this type
</span><span class="cx"> * @param array $default_generation_definitions Defines what default values should the properties of the object have. The default values
</span></span></pre></div>
<a id="trunktlibtestcaserequestphp"></a>
<div class="modfile"><h4>Modified: trunk/t/lib/testcase-request.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/lib/testcase-request.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/t/lib/testcase-request.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx">
</span><span class="cx"> class GP_UnitTestCase_Request extends GP_UnitTestCase {
</span><span class="cx"> var $body = null;
</span><del>-
</del><ins>+
</ins><span class="cx"> function get( $uri, $get_vars = array() ) {
</span><span class="cx"> $this->request( $uri, 'GET', $get_vars );
</span><span class="cx"> }
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> \$_SERVER['REQUEST_METHOD'] = $upper_method;
</span><span class="cx"> define( 'GP_CONFIG_FILE', $gp_config_path );
</span><span class="cx"> CONFIG;
</span><del>- file_put_contents( $tmp_file_name, $config_php_code );
</del><ins>+ file_put_contents( $tmp_file_name, $config_php_code );
</ins><span class="cx"> ob_start();
</span><span class="cx"> /* We need to start a new PHP process, because header() doesn't like previous output and we have plenty */
</span><span class="cx"> system('php '.escapeshellarg( dirname( __FILE__ ) . '/../bin/request.php' ).' '.escapeshellarg( $tmp_file_name ) );
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx"> function assertRedirect() {
</span><span class="cx"> $this->assertTrue( gp_startswith( $this->body, 'Redirecting to: ') );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertResponseContains( $needle ) {
</span><span class="cx"> $this->assertTrue( gp_in( $needle, $this->body ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertResponseNotContains( $needle ) {
</span><span class="cx"> $this->assertFalse( gp_in( $needle, $this->body ) );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkttest_requestsphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_requests.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_requests.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/t/test_requests.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -6,10 +6,10 @@
</span><span class="cx"> $this->get( '/' );
</span><span class="cx"> $this->assertRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_projects() {
</span><span class="cx"> $this->get( '/projects' );
</span><span class="cx"> $this->assertResponseContains( 'Projects' );
</span><span class="cx"> $this->assertResponseNotContains( 'baba' );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkttest_translationsphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_translations.php (710 => 711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_translations.php 2012-10-30 23:24:47 UTC (rev 710)
+++ trunk/t/test_translations.php 2012-10-30 23:29:25 UTC (rev 711)
</span><span class="lines">@@ -73,5 +73,5 @@
</span><span class="cx"> $domain->merge_with( $dummy_translation );
</span><span class="cx"> $this->assertEquals( '1', $domain->translate( '1' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>