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-22-22-01-44
[civicrm-core.git]
/
CRM
/
Batch
/
Page
/
Batch.php
diff --git
a/CRM/Batch/Page/Batch.php
b/CRM/Batch/Page/Batch.php
index 2164eae2f2a561658978a0e1f2bf5471fd6e8e1f..175e1e4f75bb6b59b2e71cfbefd0b5c7d48e6ce7 100644
(file)
--- a/
CRM/Batch/Page/Batch.php
+++ b/
CRM/Batch/Page/Batch.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-83,6
+83,8
@@
class CRM_Batch_Page_Batch extends CRM_Core_Page_Basic {
/**
* Get user context.
*
/**
* Get user context.
*
+ * @param null $mode
+ *
* @return string user context.
*/
function userContext($mode = NULL) {
* @return string user context.
*/
function userContext($mode = NULL) {
@@
-90,9
+92,7
@@
class CRM_Batch_Page_Batch extends CRM_Core_Page_Basic {
}
/**
}
/**
- * browse all entities.
- *
- * @param int $action
+ * Browse all entities.
*
* @return void
* @access public
*
* @return void
* @access public