Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Add $use_amp to OSCOM::getLink() for html safe & argument…

… separator"

This reverts commit 4ae0d17.
commit cdcb91c333f0d792d57bc27cddb874b8fcbaa5d2 1 parent 913c0ba
@haraldpdl haraldpdl authored
Showing with 3 additions and 13 deletions.
  1. +3 −13 osCommerce/OM/Core/OSCOM.php
View
16 osCommerce/OM/Core/OSCOM.php
@@ -208,11 +208,10 @@ public static function getRequestType() {
* @param string $connection The type of connection to use for the link. Values: NONSSL, SSL, AUTO. Default: NONSSL.
* @param bool $add_session_id Add the session ID to the link. Default: True.
* @param bool $search_engine_safe Use search engine safe URLs. Default: True.
- * @param bool $use_amp Use html safe & as argument separator. Default: True. Since v3.0.3
* @return string The URL address.
*/
- public static function getLink($site = null, $application = null, $parameters = null, $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true, $use_amp = true) {
+ public static function getLink($site = null, $application = null, $parameters = null, $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true) {
if ( empty($site) ) {
$site = static::getSite();
}
@@ -233,10 +232,6 @@ public static function getLink($site = null, $application = null, $parameters =
$search_engine_safe = true;
}
- if ( !is_bool($use_amp) ) {
- $use_amp = true;
- }
-
// Wrapper for RPC links; RPC cannot perform cross domain requests
$real_site = ($site == 'RPC') ? $application : $site;
@@ -286,8 +281,6 @@ public static function getLink($site = null, $application = null, $parameters =
if ( ($search_engine_safe === true) && Registry::exists('osC_Services') && Registry::get('osC_Services')->isStarted('sefu') ) {
$link = str_replace(array('?', '&', '='), array('/', '/', ','), $link);
- } elseif ( $use_amp === true ) {
- $link = str_replace('&', '&', $link);
}
return $link;
@@ -317,8 +310,6 @@ public static function getPublicSiteLink($url, $parameters = null, $site = null)
$link = substr($link, 0, -1);
}
- $link = str_replace('&', '&', $link);
-
return $link;
}
@@ -331,11 +322,10 @@ public static function getPublicSiteLink($url, $parameters = null, $site = null)
* @param string $connection The type of connection to use for the link. Values: NONSSL, SSL, AUTO. Default: NONSSL.
* @param bool $add_session_id Add the session ID to the link. Default: True.
* @param bool $search_engine_safe Use search engine safe URLs. Default: True.
- * @param bool $use_amp Use html safe & as argument separator. Default: False. Since v3.0.3
* @return string The URL address.
*/
- public static function getRPCLink($site = null, $application = null, $parameters = null, $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true, $use_amp = false) {
+ public static function getRPCLink($site = null, $application = null, $parameters = null, $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true) {
if ( empty($site) ) {
$site = static::getSite();
}
@@ -344,7 +334,7 @@ public static function getRPCLink($site = null, $application = null, $parameters
$application = static::getSiteApplication();
}
- return static::getLink('RPC', $site, $application . '&' . $parameters, $connection, $add_session_id, $search_engine_safe, $use_amp);
+ return static::getLink('RPC', $site, $application . '&' . $parameters, $connection, $add_session_id, $search_engine_safe);
}
public static function redirect($url) {
Please sign in to comment.
Something went wrong with that request. Please try again.