This commit was manufactured by cvs2svn to create tag 'R_0_201206171400'.
diff --git a/html/callback/getProjects.php b/html/callback/getProjects.php
index 97650ee..90bfe8a 100644
--- a/html/callback/getProjects.php
+++ b/html/callback/getProjects.php
@@ -15,10 +15,19 @@
$return = "";
if(isset($_SESSION['language'])) {
- $query = "SELECT /* getProjects.php */ DISTINCT P.project_id, P.is_active
-FROM projects AS P
-INNER JOIN files AS F ON P.project_id = F.project_id
-WHERE P.is_active = 1";
+ $query = "select
+ DISTINCT projects.*
+ from
+ projects,
+ files,
+ strings
+ where
+ projects.project_id =files.project_id
+ and
+ files.file_id = strings.file_id
+ and
+ projects.is_active = 1
+ ";
$res = mysql_query($query,$dbh);
diff --git a/html/callback/getTranslationHints.php b/html/callback/getTranslationHints.php
index 6d21855..0a81b4c 100644
--- a/html/callback/getTranslationHints.php
+++ b/html/callback/getTranslationHints.php
@@ -33,21 +33,6 @@
ORDER BY LENGTH(t.value) ASC LIMIT 15";
*/
-$train_id = "";
-$query = "SELECT train_id FROM release_trains ORDER BY train_version LIMIT 2";
-$res = mysql_query($query,$dbh);
-while($line = mysql_fetch_array($res, MYSQL_ASSOC)){
- if($train_id != "") {
- $train_id .= ",";
- }
- $train_id .= "'" . $line['train_id'] . "'";
-}
-
-if($train_id == "") {
- $train_id = 'indigo';
-}
-
-
$query = "SELECT DISTINCT t.value
FROM translations as t
INNER JOIN strings AS s ON s.string_id = t.string_id
@@ -55,7 +40,7 @@
INNER JOIN release_train_projects AS tr ON tr.project_id = f.project_id AND tr.version = f.version
WHERE s.value like '%" . addslashes($tr_string). "%'
AND t.is_active
- AND tr.train_id IN (" . $train_id . ")
+ AND tr.train_id = 'galileo'
AND t.language_id = '".addslashes($language)."'
ORDER BY LENGTH(t.value) ASC LIMIT 15";
# print $query."\n";
@@ -69,7 +54,7 @@
echo "</ul>";
}
else {
- echo "No hints found. Press [clear] to start over.";
+ echo "No hints found.";
}
?>
\ No newline at end of file
diff --git a/html/js/translationHint.js b/html/js/translationHint.js
index 69deb6c..3351afb 100644
--- a/html/js/translationHint.js
+++ b/html/js/translationHint.js
@@ -25,7 +25,7 @@
YAHOO.log('failed!');
}
}
- YAHOO.util.Connect.asyncRequest('POST', "callback/getTranslationHints.php", callback, "tr_string="+encodeURIComponent(trString));
+ YAHOO.util.Connect.asyncRequest('POST', "callback/getTranslationHints.php", callback, "tr_string="+trString);
this.setupCB();
}
