projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-01-14-40-22
[civicrm-core.git]
/
CRM
/
Contribute
/
Page
/
ContributionPage.php
diff --git
a/CRM/Contribute/Page/ContributionPage.php
b/CRM/Contribute/Page/ContributionPage.php
index d6b8588f94441a10039305d90fe86764e9398e06..c958e280b70a3c5963389e596383e8c432b9b24b 100644
(file)
--- a/
CRM/Contribute/Page/ContributionPage.php
+++ b/
CRM/Contribute/Page/ContributionPage.php
@@
-386,6
+386,8
@@
AND cp.page_type = 'contribute'
/**
* Browse all contribution pages
*
/**
* Browse all contribution pages
*
+ * @param null $action
+ *
* @return void
* @access public
* @static
* @return void
* @access public
* @static
@@
-552,6
+554,12
@@
ORDER BY title asc
$form->run();
}
$form->run();
}
+ /**
+ * @param array $params
+ * @param bool $sortBy
+ *
+ * @return int|string
+ */
function whereClause(&$params, $sortBy = TRUE) {
$values = $clauses = array();
$title = $this->get('title');
function whereClause(&$params, $sortBy = TRUE) {
$values = $clauses = array();
$title = $this->get('title');
@@
-612,6
+620,10
@@
ORDER BY title asc
return implode(' AND ', $clauses);
}
return implode(' AND ', $clauses);
}
+ /**
+ * @param $whereClause
+ * @param $whereParams
+ */
function pager($whereClause, $whereParams) {
$params['status'] = ts('Contribution %%StatusMessage%%');
function pager($whereClause, $whereParams) {
$params['status'] = ts('Contribution %%StatusMessage%%');
@@
-634,6
+646,10
@@
SELECT count(id)
$this->assign_by_ref('pager', $this->_pager);
}
$this->assign_by_ref('pager', $this->_pager);
}
+ /**
+ * @param $whereClause
+ * @param $whereParams
+ */
function pagerAtoZ($whereClause, $whereParams) {
$query = "
function pagerAtoZ($whereClause, $whereParams) {
$query = "
@@
-648,6
+664,11
@@
SELECT count(id)
$this->assign('aToZ', $aToZBar);
}
$this->assign('aToZ', $aToZBar);
}
+ /**
+ * @param $sectionsInfo
+ *
+ * @return array
+ */
function formatConfigureLinks($sectionsInfo) {
//build the formatted configure links.
$formattedConfLinks = self::configureActionLinks();
function formatConfigureLinks($sectionsInfo) {
//build the formatted configure links.
$formattedConfLinks = self::configureActionLinks();