Author: buildbot
Date: Sun Apr 29 21:54:45 2012
New Revision: 815049
Log:
Staging update by buildbot for openofficeorg
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/download/test/download_new_dl.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Apr 29 21:54:45 2012
@@ -1 +1 @@
-1332005
+1332006
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Apr 29 21:54:45 2012
@@ -1 +1 @@
-1332005
+1332006
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_new_dl.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download_new_dl.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_new_dl.js
Sun Apr 29 21:54:45 2012
@@ -380,7 +380,11 @@ function hasMirrorLink() {
if (schema == "aoo_inclubating") {
platform = getPlatform(schema);
}
-
+ /* first check for availability */
+ if ( platform == "none") {
+ return false;
+ }
+
if ( a[4] == 'y' ) {
// special handling for MAC, links in combination with general
flag a[4]
if ( platform.indexOf( "Mac" ) == -1 || a[5] == 'y' ) {
@@ -546,15 +550,15 @@ function getPlatform(schema) {
}
}
} else if ( navigator.platform.indexOf( "SunOS i86pc" ) != -1 )
{
- return "";
+ return "none";
} else if ( navigator.platform.indexOf( "SunOS sun4u" ) != -1 )
{
- return "";
+ return "none";
} else if ( navigator.platform.indexOf( "SunOS" ) != -1 ) {
- return "";
+ return "none";
} else if ( navigator.platform.indexOf( "Mac" ) != -1 &&
navigator.platform.indexOf( "Intel" ) != -1 ) {
return "Mac OS Intel";
} else if ( navigator.platform.indexOf( "Mac" ) != -1 &&
navigator.platform.indexOf( "PPC" ) != -1 ) {
- return "";
+ return "none";
} else if ( navigator.platform.indexOf( "Mac" ) != -1 ) {
return "Mac OS Intel" ;
} else if ( navigator.platform.indexOf( "iPad" ) != -1 ||
navigator.platform.indexOf( "iPhone" ) != -1 ||
