From 3d41e43d70ea76964a36317c763565aff85914e0 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Wed, 19 Mar 2008 16:17:18 +0000
Subject: [PATCH] Revert the fix for #41475

---
 results.php | 2 +-
 ws.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/results.php b/results.php
index 010b22d5a..f0a37f42f 100644
--- a/results.php
+++ b/results.php
@@ -42,7 +42,7 @@ $per_page = 10;
 $valid_profiles = array('all', 'local', 'manual', 'news', 'bugs', 'pear', 'pecl', 'talks');
 $scope = in_array($profile, $valid_profiles) ? $profile : 'all';
 $srch_host = "www.php.net";
-$srch_rqst = "/ws.php?profile=$scope&q=$q&amp;lang=$l&results=$per_page&start=$s&mirror=".trim(substr($MYSITE,7),'/');
+$srch_rqst = "/ws.php?profile=$scope&q=$q&lang=$l&results=$per_page&start=$s&mirror=".trim(substr($MYSITE,7),'/');
 $url = "http://".$srch_host.$srch_rqst;
 
 if(function_exists('file_get_contents') && ini_get('allow_url_fopen')) {
diff --git a/ws.php b/ws.php
index b3df0db55..71c1db985 100644
--- a/ws.php
+++ b/ws.php
@@ -25,7 +25,7 @@ if(isset($sites[$_REQUEST['profile']])) {
   $scope = 'all';
 }
 
-$request =  "{$conf['svc']}?appid={$conf['appid']}&amp;query=$q&amp;start=$s&amp;results=$r&amp;site={$sites[$scope]}&amp;language=$l&amp;output=php";
+$request =  "{$conf['svc']}?appid={$conf['appid']}&query=$q&start=$s&results=$r&site={$sites[$scope]}&language=$l&output=php";
 $data = @file_get_contents($request);
 list($version,$status_code,$msg) = explode(' ',$http_response_header[0], 3);
 if($status_code==200) echo $data;