Revision: 293
http://phpbbproject.svn.sourceforge.net/phpbbproject/?rev=293&view=rev
Author: lord_le_brand
Date: 2008-10-22 12:24:22 +0000 (Wed, 22 Oct 2008)
Log Message:
-----------
woops! these were supposed to be commited long time ago!
Modified Paths:
--------------
trunk/phpbb3/root/includes/project/project_main.php
trunk/phpbb3/root/includes/project/project_project.php
trunk/phpbb3/root/includes/sources_project/download_project.php
Modified: trunk/phpbb3/root/includes/project/project_main.php
===================================================================
--- trunk/phpbb3/root/includes/project/project_main.php 2008-08-07 17:53:32 UTC (rev 292)
+++ trunk/phpbb3/root/includes/project/project_main.php 2008-10-22 12:24:22 UTC (rev 293)
@@ -214,7 +214,7 @@
{
$start = request_var('start', 0);
- $default_key = 'lu';
+ $default_key = 'update';
$sort_key = request_var('sk', $default_key);
$sort_dir = request_var('sd', 'd');
@@ -225,13 +225,13 @@
}
$sort_by_sql = array(
- 'lu' => 'project_last_update',
- 'pt' => 'project_title',
- 'st' => 'project_start_time',
- 'it' => 'project_install_time',
- 'dl' => 'project_downloads',
- 'ds' => 'project_stage',
- 'lv' => 'project_level',
+ 'update' => 'project_last_update',
+ 'title' => 'project_title',
+ 'stime' => 'project_start_time',
+ 'itime' => 'project_install_time',
+ 'downloads' => 'project_downloads',
+ 'stage' => 'project_stage',
+ 'ilevel' => 'project_level',
);
if (!isset($sort_by_sql[$sort_key]))
@@ -502,4 +502,5 @@
'U_ACTION' => $this->u_action,
));
}
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
Modified: trunk/phpbb3/root/includes/project/project_project.php
===================================================================
--- trunk/phpbb3/root/includes/project/project_project.php 2008-08-07 17:53:32 UTC (rev 292)
+++ trunk/phpbb3/root/includes/project/project_project.php 2008-10-22 12:24:22 UTC (rev 293)
@@ -99,7 +99,8 @@
WHERE pa.project_id = $project_id
AND a.author_id = pa.author_id
AND r.role_id = pa.author_role
- AND u.user_id = pa.author_id";
+ AND u.user_id = pa.author_id
+ ORDER BY pa.author_order ASC";
$db->sql_query($sql);
$authors = $db->sql_fetchrowset();
Modified: trunk/phpbb3/root/includes/sources_project/download_project.php
===================================================================
--- trunk/phpbb3/root/includes/sources_project/download_project.php 2008-08-07 17:53:32 UTC (rev 292)
+++ trunk/phpbb3/root/includes/sources_project/download_project.php 2008-10-22 12:24:22 UTC (rev 293)
@@ -189,24 +189,15 @@
$author_ids = array();
- $sql = 'SELECT *
- FROM ' . PROJECT_PROJECT_AUTHORS_TABLE . "
- WHERE project_id = $this->project_id";
+ $sql = 'SELECT a.*, pa.*
+ FROM ' . PROJECT_AUTHORS_TABLE . ' a, ' . PROJECT_PROJECT_AUTHORS_TABLE . " pa
+ WHERE pa.project_id = $this->project_id
+ AND a.author_id = pa.author_id
+ ORDER BY author_order ASC";
$result = $db->sql_query($sql, 604800);
while ($row = $db->sql_fetchrow($result))
{
- $author_ids[] = $row['author_id'];
- }
- $db->sql_freeresult($result);
-
- $sql = 'SELECT *
- FROM ' . PROJECT_AUTHORS_TABLE . '
- WHERE ' . $db->sql_in_set('author_id', $author_ids);
-
- $result = $db->sql_query($sql, 604800);
- while ($row = $db->sql_fetchrow($result))
- {
$this->mod_authors[] = array(
'username' => $row['author_username'],
'email' => $row['author_email'],
@@ -244,11 +235,11 @@
foreach ($mod_history as $entry)
{
$this->mod_history[] = array(
- 'time' => gmdate('Y-m-d', $entry['version_time']),
- 'version' => "{$entry['version_major']}.{$entry['version_minor']}.{$entry['version_revision']}{$entry['version_release']}",
- 'version_p' => array($entry['version_major'], $entry['version_minor'], $entry['version_revision'], $entry['version_release']),
- 'stage' => ($entry['version_stage']) ? $stages_ary[$entry['version_stage']] : false,
- 'changelog' => $entry['version_changelog'],
+ 'time' => gmdate('Y-m-d', $entry['version_time']),
+ 'version' => "{$entry['version_major']}.{$entry['version_minor']}.{$entry['version_revision']}{$entry['version_release']}",
+ 'version_ary' => array($entry['version_major'], $entry['version_minor'], $entry['version_revision'], $entry['version_release']),
+ 'stage' => ($entry['version_stage']) ? $stages_ary[$entry['version_stage']] : false,
+ 'changelog' => $entry['version_changelog'],
);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
