<!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][942] trunk: Prevent PHP notices and renamed data to sets.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/942">942</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2014-08-09 22:26:28 +0000 (Sat, 09 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent PHP notices and renamed data to sets. See @212</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesrouteslocalephp">trunk/gp-includes/routes/locale.php</a></li>
<li><a href="#trunkgptemplateslocalephp">trunk/gp-templates/locale.php</a></li>
<li><a href="#trunkgptemplateslocalesphp">trunk/gp-templates/locales.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesrouteslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/locale.php (941 => 942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/locale.php 2014-08-09 20:19:16 UTC (rev 941)
+++ trunk/gp-includes/routes/locale.php 2014-08-09 22:26:28 UTC (rev 942)
</span><span class="lines">@@ -2,7 +2,9 @@
</span><span class="cx"> class GP_Route_Locale extends GP_Route_Main {
</span><span class="cx">
</span><span class="cx"> function locales_get() {
</span><del>- $this->tmpl( 'locales' );
</del><ins>+ $locales = GP_Locales::locales();
+
+ $this->tmpl( 'locales', get_defined_vars() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function single( $locale_slug ) {
</span><span class="lines">@@ -17,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $sets as $set ) {
</span><span class="cx"> // Store project data for later use
</span><del>- if ( isset( $projects[$set->project_id] ) ) {
</del><ins>+ if ( isset( $projects[ $set->project_id ] ) ) {
</ins><span class="cx"> $set_project = $projects[$set->project_id];
</span><span class="cx"> } else {
</span><span class="cx"> $set_project = GP::$project->get( $set->project_id );
</span><span class="lines">@@ -29,7 +31,6 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> $parent_id = is_null( $set_project->parent_project_id ) ? $set_project->id : $set_project->parent_project_id;
</span><span class="cx">
</span><span class="cx"> // Store parent project data for later use
</span><span class="lines">@@ -45,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! in_array( $set_project->parent_project_id, $locale_projects ) ) {
</span><span class="cx"> $projects_data[$parent_id][$set_project->id]['project'] = $set_project;
</span><del>- $projects_data[$parent_id][$set_project->id]['data'][$set->slug] = $this->set_data( $set );
</del><ins>+ $projects_data[$parent_id][$set_project->id]['sets'][$set->slug] = $this->set_data( $set );
</ins><span class="cx">
</span><span class="cx"> if ( ! isset( $projects_data[$parent_id][$set_project->id]['project'] ) ) {
</span><span class="cx"> $projects_data[$parent_id][$set_project->id]['project'] = $set_project;
</span><span class="lines">@@ -62,12 +63,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //For when root project has sets, and sub projects.
</span><del>- if ( ! isset( $projects_data[$parent_id][$previous_parent] ) ) {
</del><ins>+ if ( ! isset( $previous_parent ) || ! isset( $projects_data[$parent_id][$previous_parent] ) ) {
</ins><span class="cx"> $previous_parent = $parent_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $set_data = $projects_data[$parent_id][$previous_parent]['data'][$set->slug];
- $projects_data[$parent_id][$previous_parent]['data'][$set->slug] = $this->set_data( $set, $set_data );
</del><ins>+ $set_data = $projects_data[$parent_id][$previous_parent]['sets'][$set->slug];
+ $projects_data[$parent_id][$previous_parent]['sets'][$set->slug] = $this->set_data( $set, $set_data );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -77,17 +78,23 @@
</span><span class="cx"> private function set_data( $set, $set_data = null ) {
</span><span class="cx"> if ( ! $set_data ) {
</span><span class="cx"> $set_data = new stdClass;
</span><ins>+
+ $set_data->waiting_count = $set->waiting_count();
+ $set_data->current_count = $set->current_count();
+ $set_data->fuzzy_count = $set->fuzzy_count();
+ $set_data->all_count = $set->all_count();
</ins><span class="cx"> }
</span><ins>+ else {
+ $set_data->waiting_count += $set->waiting_count();
+ $set_data->current_count += $set->current_count();
+ $set_data->fuzzy_count += $set->fuzzy_count();
+ $set_data->all_count += $set->all_count();
+ }
</ins><span class="cx">
</span><span class="cx"> if ( ! isset( $set_data->name ) ) {
</span><span class="cx"> $set_data->name = $set->name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $set_data->waiting_count += $set->waiting_count();
- $set_data->current_count += $set->current_count();
- $set_data->fuzzy_count += $set->fuzzy_count();
- $set_data->all_count += $set->all_count();
-
</del><span class="cx"> return $set_data;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkgptemplateslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/locale.php (941 => 942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/locale.php 2014-08-09 20:19:16 UTC (rev 941)
+++ trunk/gp-templates/locale.php 2014-08-09 22:26:28 UTC (rev 942)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> <?php echo esc_html( $projects[$sub_project_id]->name ); ?>
</span><span class="cx"> </th>
</span><span class="cx"> </tr>
</span><del>- <?php foreach ( $sets['data'] as $set_slug => $set_data ) : ?>
</del><ins>+ <?php foreach ( $sets['sets'] as $set_slug => $set_data ) : ?>
</ins><span class="cx"> <tr>
</span><span class="cx"> <td class="set-name">
</span><span class="cx"> <strong><?php gp_link( gp_url_project( $sets['project'], gp_url_join( $locale->slug, $set_slug ) ), $set_data->name ); ?></strong>
</span></span></pre></div>
<a id="trunkgptemplateslocalesphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/locales.php (941 => 942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/locales.php 2014-08-09 20:19:16 UTC (rev 941)
+++ trunk/gp-templates/locales.php 2014-08-09 22:26:28 UTC (rev 942)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="cx"> <tbody>
</span><del>- <?php foreach ( GP_Locales::locales() as $locale ) :?>
</del><ins>+ <?php foreach ( $locales as $locale ) : ?>
</ins><span class="cx"> <tr class="<?php echo $parity(); ?>">
</span><span class="cx"> <?php echo "<td>" . gp_link_get( gp_url_join( gp_url_current(), $locale->slug ), $locale->english_name ) . "</td>" ?>
</span><span class="cx"> <?php echo "<td>" . gp_link_get( gp_url_join( gp_url_current(), $locale->slug ), $locale->native_name ) . "</td>" ?>
</span></span></pre>
</div>
</div>
</body>
</html>