Commit ceb39c0a authored by jaapjansma's avatar jaapjansma

Merge branch 'currentPath' into 'master'

Switch to non-deprecated function CRM_Utils_System::currentPath

See merge request !37
parents 1b171993 1f58a820
......@@ -69,7 +69,7 @@ class CRM_Contact_Controller_DataProcessorContactSearch extends CRM_Core_Control
if (!$this->_pages[$pageName] instanceof CRM_DataprocessorSearch_Form_ContactSearch) {
$session = CRM_Core_Session::singleton();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -58,7 +58,7 @@ class CRM_Contact_Form_DataProcessorContactSearch extends CRM_DataprocessorSearc
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_contact_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_contact_search/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -77,7 +77,7 @@ class CRM_Contact_Form_DataProcessorContactSummaryTab extends CRM_DataprocessorS
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_contact_summary/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_contact_summary/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -104,7 +104,7 @@ class CRM_Contact_Selector_DataProcessorContactSearch {
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_contact_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_contact_search/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -59,7 +59,7 @@ class CRM_Dataprocessor_Form_ManageDataProcessors extends CRM_Core_Form {
$session = CRM_Core_Session::singleton();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -58,7 +58,7 @@ class CRM_DataprocessorSearch_Controller_ActivitySearch extends CRM_Core_Control
if (!$this->_pages[$pageName] instanceof CRM_DataprocessorSearch_Form_ActivitySearch) {
$session = CRM_Core_Session::singleton();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -58,7 +58,7 @@ class CRM_DataprocessorSearch_Controller_CaseSearch extends CRM_Core_Controller
if (!$this->_pages[$pageName] instanceof CRM_DataprocessorSearch_Form_CaseSearch) {
$session = CRM_Core_Session::singleton();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -58,7 +58,7 @@ class CRM_DataprocessorSearch_Controller_ContributionSearch extends CRM_Core_Con
if (!$this->_pages[$pageName] instanceof CRM_DataprocessorSearch_Form_ContributionSearch) {
$session = CRM_Core_Session::singleton();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -58,7 +58,7 @@ class CRM_DataprocessorSearch_Controller_MembershipSearch extends CRM_Core_Contr
if (!$this->_pages[$pageName] instanceof CRM_DataprocessorSearch_Form_MembershipSearch) {
$session = CRM_Core_Session::singleton();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -58,7 +58,7 @@ class CRM_DataprocessorSearch_Controller_ParticipantSearch extends CRM_Core_Cont
if (!$this->_pages[$pageName] instanceof CRM_DataprocessorSearch_Form_ParticipantSearch) {
$session = CRM_Core_Session::singleton();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -58,7 +58,7 @@ class CRM_DataprocessorSearch_Controller_Search extends CRM_Core_Controller {
if (!$this->_pages[$pageName] instanceof CRM_DataprocessorSearch_Form_Search) {
$session = CRM_Core_Session::singleton();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -162,7 +162,7 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
parent::preProcess();
$qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
$urlPath = CRM_Utils_System::getUrlPath();
$urlPath = CRM_Utils_System::currentPath();
$urlParams = 'force=1';
if ($qfKey) {
$urlParams .= "&qfKey=$qfKey";
......
......@@ -45,7 +45,7 @@ class CRM_DataprocessorSearch_Form_ActivitySearch extends CRM_DataprocessorSearc
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_activity_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_activity_search/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -50,7 +50,7 @@ class CRM_DataprocessorSearch_Form_CaseSearch extends CRM_DataprocessorSearch_Fo
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_case_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_case_search/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -57,7 +57,7 @@ class CRM_DataprocessorSearch_Form_ContributionSearch extends CRM_DataprocessorS
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_contribution_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_contribution_search/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -57,7 +57,7 @@ class CRM_DataprocessorSearch_Form_MembershipSearch extends CRM_DataprocessorSea
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_membership_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_membership_search/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -57,7 +57,7 @@ class CRM_DataprocessorSearch_Form_ParticipantSearch extends CRM_DataprocessorSe
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_participant_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_participant_search/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -37,7 +37,7 @@ class CRM_DataprocessorSearch_Form_Search extends CRM_DataprocessorSearch_Form_A
* @return String
*/
protected function getDataProcessorName() {
$dataProcessorName = str_replace('civicrm/dataprocessor_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_search/', '', CRM_Utils_System::currentPath());
return $dataProcessorName;
}
......
......@@ -19,7 +19,7 @@ class CRM_DataprocessorSearch_Task extends CRM_Core_Task {
*/
public static function tasks() {
if (!(self::$_tasks)) {
$dataProcessorName = str_replace('civicrm/dataprocessor_search/', '', CRM_Utils_System::getUrlPath());
$dataProcessorName = str_replace('civicrm/dataprocessor_search/', '', CRM_Utils_System::currentPath());
self::$objectType = 'dataprocessor_'.$dataProcessorName;
self::$_tasks = array();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment