From 99833cac0b12ae0c7cb04995fa33f911b0eb8464 Mon Sep 17 00:00:00 2001 From: "mike.morgan%oregonstate.edu" Date: Fri, 15 Sep 2006 18:46:01 +0000 Subject: [PATCH] Pulling out fallback patch until we can determine how we're going to stop the fallback from happening when we know we don't want it to fallback... :\ See bug 344742. --- webtools/aus/xml/inc/patch.class.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/webtools/aus/xml/inc/patch.class.php b/webtools/aus/xml/inc/patch.class.php index e0c1a69d4be9..020fe19a58e4 100644 --- a/webtools/aus/xml/inc/patch.class.php +++ b/webtools/aus/xml/inc/patch.class.php @@ -233,26 +233,9 @@ class Patch extends AUS_Object { return true; } - // If our channel matches our regexp for fallback channels, let's try to fallback. - if (preg_match('/^\w+\-cck\-\w+$/',$channel)) { - - // Partner fallback channel to be used if the partner-specific update doesn't exist or work. - $buf = array(); - $buf = split('-cck-',$channel); - $fallbackChannel = $buf[0]; - - // Do a check for the fallback update. If we find a valid fallback update, we can offer it. - if (!empty($fallbackChannel) && $this->setPath($product,$platform,$locale,$version,$build,3,$fallbackChannel) && file_exists($this->path) && filesize($this->path) > 0) { - $this->setSnippet($this->path); - $this->setVar('isPatch',true,true); - return true; - } - } - // Determine the branch of the client's version. $branchVersion = $this->getBranch($version); - // Otherwise, if it is a complete patch and a nightly channel, force the complete update to take the user to the latest build. if ($this->isComplete() && $this->isNightlyChannel($channel)) {