Merge in Civi Core

.gitignore

@@ -78,8 +78,10 @@ CRM/Core/DAO/PriceField.php
 CRM/Core/DAO/PriceSet.php
 CRM/Core/DAO/PriceSetEntity.php
 CRM/Core/DAO/PrintLabel.php
+CRM/Core/DAO/RecurringEntity.php
 CRM/Core/DAO/Setting.php
 CRM/Core/DAO/StateProvince.php
+CRM/Core/DAO/SystemLog.php
 CRM/Core/DAO/Tag.php
 CRM/Core/DAO/Timezone.php
 CRM/Core/DAO/UFField.php
@@ -122,6 +124,7 @@ packages/doc
 packages/temp
 packages/test
 settings_location.php
+sql/case_sample.mysql
 sql/civicrm.mysql
 sql/civicrm_acl.??_??.mysql
 sql/civicrm_acl.mysql
@@ -142,6 +145,7 @@ WordPress
 joomla
 packages/
 tests/phpunit/CiviTest/civicrm.settings.local.php
+tests/phpunit/CiviTest/truncate.xml
 tools/scripts/releaser/releaser.conf
 tools/tests/reports/logfile.tap
 tools/tests/reports/testdox.html
@@ -151,3 +155,4 @@ vendor
 civicrm.settings.php
 sql/dummy_processor.mysql
 distmaker/distmaker.conf
+distmaker/out

CONTRIBUTORS.txt

@@ -1,5 +1,116 @@
 The following people and organizations sponsored and/or contributed new and improved features to the project.
 
+************************************************
+Key Contributors and Sponsors for 4.5
+************************************************
+
+CiviCRM Team - Coleman Watts, David Greenberg, Donald Lobo,
+               Kurund Jalmi, Michael McAndrew, Monish Deb, Pratik Joshi,
+               Tim Otten, Yashodha Chaku, Eileen McNaughton
+AGH Strategies - Andrew Hunt, Maggie Epps, Tyrell Cook
+Allan Chappell
+Amnesty International Spain - Carlos Capote
+Andy Clark
+Arete Imagine - Marisa Porter, Nate Porter
+Botanical Society of America - Toby Lounsbury
+Chris Burgess
+Chris Ward
+Circle Interactive - Andrew Walker, Dave Jenkins
+CiviDesk - Nicolas Ganivet, Sunil Pawar
+Compucorp - Jamie Novick, Erawat Chamanont
+CiviCoop - Erik Hommel, Jaap Jansma
+Detlev Sieber
+Drishtant - Ruchi Kumar
+Drupal Association - Neil Drumm
+Electronic Frontier Foundation - Mark Burdett, Max Hunter, Leez Wright
+Freeform Solutions - Lola Slade
+Fuzion, NZ - Eileen McNaughton, Peter Davis, Torrance Hodgeson
+Giant Rabbit - Peter Haight, Anthony Nemirovsky
+Ginkgo Street Labs - Frank J. Gómez, Michael Daryabeygi
+Graham Mitchell
+Great Lakes Planetarium Association - Geoff Holt
+Jennifer Simonis
+Jeremy Proffitt
+Jim Meehan
+Jimmy Huang
+JMA Consulting - Joe Murray
+Joanne Chester
+Ken West
+Kirk Jackson
+Korlon - Stuart Gaston
+Koumbit - Samuel Vanhove
+Lighthouse Consulting and Design - Brian Shaughnessy
+Mathieu Lutfy
+Mission Matters - Joshua Aranda
+National Democratic Institute - Chris Doten
+New York State Senate - Ken Zalewski
+Niro Solutions
+Palente Technology Cooperative - Jon Goldberg, Joseph Lacey
+Pogstone - Sarah Gladstone
+Progressive Tech Project - Alice Aguilar, Jamie McClelland
+Semper IT - Karin Gerritsen
+Skvare - Mark Hanna, Peter Petrik
+Systopia - Björn Endres
+Tadpole - Dana Skallman
+Tech to the People - Xavier Dutoit
+Veda Consulting - Parvez Saleh, Deepak Srivastava
+Web Access - Pradeep Nayak, Tony Mazzarella
+Wikimedia Foundation - Adam Wight
+Zing - Simon West, Andrew Tombs
+
+************************************************
+Key Contributors and Sponsors for 4.4
+************************************************
+
+CiviCRM Team - Coleman Watts, David Greenberg, Donald Lobo,
+               Kurund Jalmi, Michael McAndrew, Monish Deb,
+               Tim Otten, Yashodha Chaku, Eileen McNaughton
+AGH Strategies - Andrew Hunt
+Backoffice Thinking
+Chris Burgess
+Circle Interactive - Andrew Walker, Dave Jenkins
+CiviDesk - Nicolas Ganivet
+CiviCoop - Erik Hommel, Jaap Jansma
+CiviHosting - Hershel Robinson
+CompuCorp - Jamie Novick, Erawat Chamanont
+Confluence - Frank Gomez, Michael Daryabeygi
+Dave D
+Detlev Sieber
+Drupal Association - Neil Drumm
+Electronic Frontier Foundation - Micah Lee, Kellie Brownell
+Emphanos - Allen Shaw
+Freeform Solutions - Lola Slade
+Fuzion, NZ - Eileen McNaughton, Peter Davis, Torrance Hodgeson
+Giant Rabbit - Anna Heath
+Jim Meehan
+JMA Consulting - Joe Murray
+Joanne Chester
+Keith Morgan
+Ken West
+Korlon - Stuart Gaston
+Koumbit - Samuel Vanhove
+Lighthouse Consulting and Design - Brian Shaughnessy
+Mathieu Lutfy
+National Democratic Institute - Chris Doten
+New York State Senate - Ken Zalewski
+NfP Services (MTL Software Group) - Jag Kandasamy, Rajesh Sundararajan
+Niro Solutions
+Noah Miller
+Orgis - Hans Idink
+Palente Technology Cooperative - Jon Goldberg, Joseph Lacey
+Paul Delbar
+Pogstone - Sarah Gladstone
+Progressive Tech Project - Alice Aguilar, Jamie McClelland
+Registered Nurses Association of Ontario
+San Francisco Baykeeper - Eliet Henderson
+Tadpole - Dana Skallman
+Tallyfox
+Tech to the People - Xavier Dutoit
+Veda Consulting - Parvez Saleh, Deepak Srivastava
+Web Access - Pradeep Nayak
+Wikimedia Foundation - Adam Wight
+Zing - Simon West, Andrew Tombs
+
 ************************************************
 Key Contributors and Sponsors for 4.3
 ************************************************
@@ -10,17 +121,17 @@ CiviCRM Team - Coleman Watts, David Greenberg, Deepak Srivastava, Donald Lobo,
 AGH Strategies - Andrew Hunt
 Backoffice Thinking
 Chris Burgess
-Circle Interactive - Andrew Walker, Dave Moreton
+Circle Interactive - Andrew Walker, Dave Jenkins
 CiviDesk - Nicolas Ganivet
 CiviHosting - Hershel Robinson
 Community Builders
 Compucorp
-Confluence - Frank Gomez
 Dave D
 EE-atWork - Erik Hommel
 Electronic Frontier Foundation - Micah Lee, Kellie Brownell
 Emphanos - Allen Shaw
 Fuzion, NZ - Eileen McNaughton, Peter Davis, Torrance Hodgeson
+Ginkgo Street Labs - Frank J. Gómez, Michael Daryabeygi
 Jim Meehan
 JMA Consulting - Joe Murray, Pradeep Nayak
 Keith Morgan
@@ -81,7 +192,6 @@ Lisa Jervis
 Mathieu Lutfy
 Matt Neimayer
 Micah Lee
-Michael Daryabeygi
 Michael McAndrew
 Nicolas Ganivet
 Noah Miller

CRM/ACL/API.php

@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -138,7 +138,11 @@ public static function whereClause($type,
    * get all the groups the user has access to for the given operation
    *
    * @param int $type the type of permission needed
-   * @param int    $contactID the contactID for whom the check is made
+   * @param int $contactID the contactID for whom the check is made
+   *
+   * @param string $tableName
+   * @param null $allGroups
+   * @param null $includedGroups
    *
    * @return array the ids of the groups for which the user has permissions
    * @access public
@@ -167,7 +171,13 @@ public static function group(
    * check if the user has access to this group for operation $type
    *
    * @param int $type the type of permission needed
-   * @param int    $contactID the contactID for whom the check is made
+   * @param $groupID
+   * @param int $contactID the contactID for whom the check is made
+   *
+   * @param string $tableName
+   * @param null $allGroups
+   * @param null $includedGroups
+   * @param bool $flush
    *
    * @return array the ids of the groups for which the user has permissions
    * @access public
@@ -178,10 +188,17 @@ public static function groupPermission(
     $contactID      = NULL,
     $tableName      = 'civicrm_saved_search',
     $allGroups      = NULL,
-    $includedGroups = NULL
+    $includedGroups = NULL,
+    $flush = FALSE
   ) {
-    static $cache = array();
 
+    static $cache = array();
+    //@todo this is pretty hacky!!!
+    //adding a way for unit tests to flush the cache
+    if ($flush) {
+      $cache = array();
+      return;
+    }
     if (!$contactID) {
       $session = CRM_Core_Session::singleton();
       $contactID = NULL;