Alexander Nicolaysen Sørnes <alex@thehandofagony.com>
Remove the vendor from keywords hack. There are no longer any entries with this data in the application queues.
This commit is contained in:
@@ -882,9 +882,7 @@ class Application {
|
|||||||
{
|
{
|
||||||
$oUser = new user($this->iSubmitterId);
|
$oUser = new user($this->iSubmitterId);
|
||||||
$oVendor = new vendor($this->iVendorId);
|
$oVendor = new vendor($this->iVendorId);
|
||||||
if(!$oVendor->sName)
|
|
||||||
$sVendor = get_vendor_from_keywords($this->sKeywords);
|
|
||||||
else
|
|
||||||
$sVendor = $oVendor->objectMakeLink();
|
$sVendor = $oVendor->objectMakeLink();
|
||||||
|
|
||||||
$oTableRow = new TableRow();
|
$oTableRow = new TableRow();
|
||||||
@@ -1115,11 +1113,4 @@ class Application {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_vendor_from_keywords($sKeywords)
|
|
||||||
{
|
|
||||||
$aKeywords = explode(" *** ",$sKeywords);
|
|
||||||
$iLastElt = (sizeOf($aKeywords)-1);
|
|
||||||
return($aKeywords[$iLastElt]);
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -178,14 +178,6 @@ class application_queue
|
|||||||
|
|
||||||
$this->oApp->outputEditor();
|
$this->oApp->outputEditor();
|
||||||
|
|
||||||
/* We need to accept vendors submitted using the old
|
|
||||||
keyword hack. This should be removed soon */
|
|
||||||
if(!$this->oVendor->sName && $this->oApp->iAppId)
|
|
||||||
{
|
|
||||||
$this->oVendor->sName = get_vendor_from_keywords(
|
|
||||||
$this->oApp->sKeywords);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Display the new vendor form for new applications or if we
|
/* Display the new vendor form for new applications or if we
|
||||||
are processing an application and the vendor is queued */
|
are processing an application and the vendor is queued */
|
||||||
if(!$this->oApp->iAppId || $this->oVendor->sQueued != "false")
|
if(!$this->oApp->iAppId || $this->oVendor->sQueued != "false")
|
||||||
|
|||||||
Reference in New Issue
Block a user