Make url consistent
This commit is contained in:
		@@ -47,8 +47,27 @@ class CRM_EntityTemplates_Utils {
 | 
			
		||||
        $entities = CRM_EntityTemplates_BAO_EntityTemplates::getEntityTemplates($form->_entityTemplateValues['value']);
 | 
			
		||||
        if (!empty($entities)) {
 | 
			
		||||
          $form->add('select', 'entity_template_id', ts('Templates'), $entities, FALSE, ['placeholder' => ts('- select -'), 'class' => 'crm-select2']);
 | 
			
		||||
 | 
			
		||||
          list($url, $query) = explode('?', $form->_entityTemplateValues['name']);
 | 
			
		||||
          $url = CRM_Utils_System::url($url, $query);
 | 
			
		||||
          $queryString = $form->get('queryString');
 | 
			
		||||
          if (empty($queryString)) {
 | 
			
		||||
            if (!empty($_SERVER['REDIRECT_QUERY_STRING'])) {
 | 
			
		||||
              $queryString = $_SERVER['REDIRECT_QUERY_STRING'];
 | 
			
		||||
            }
 | 
			
		||||
            else {
 | 
			
		||||
              $queryString = $query;
 | 
			
		||||
            }
 | 
			
		||||
          }
 | 
			
		||||
          parse_str($queryString, $queryString);
 | 
			
		||||
          if (isset($queryString['templateId'])) {
 | 
			
		||||
            unset($queryString['templateId']);
 | 
			
		||||
          }
 | 
			
		||||
          if (isset($queryString['snippet'])) {
 | 
			
		||||
            unset($queryString['snippet']);
 | 
			
		||||
          }
 | 
			
		||||
          $queryString = http_build_query($queryString);
 | 
			
		||||
          $form->set('queryString', $queryString);
 | 
			
		||||
          $url = CRM_Utils_System::url($url, $queryString, FALSE, NULL, FALSE);
 | 
			
		||||
          $form->assign('redirectUrl', $url);
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user