civicrm-core.git
11 years agoMerge pull request #911 from agh1/membership-dash-counts-new
Yashodha Chaku [Fri, 7 Jun 2013 14:00:46 +0000 (07:00 -0700)]
Merge pull request #911 from agh1/membership-dash-counts-new

Membership dash counts fixed but no good search

11 years agoMerge pull request #975 from ravishnair/test-fix
Kurund Jalmi [Fri, 7 Jun 2013 04:51:41 +0000 (21:51 -0700)]
Merge pull request #975 from ravishnair/test-fix

-- CRM test fix

11 years ago-- CRM test fix
Ravish Nair [Fri, 7 Jun 2013 04:42:57 +0000 (10:12 +0530)]
-- CRM test fix

11 years agoMerge pull request #973 from eileenmcnaughton/master
dlobo [Thu, 6 Jun 2013 21:59:30 +0000 (14:59 -0700)]
Merge pull request #973 from eileenmcnaughton/master

 CRM-12773  api - handle null value for a custom field gracefully

11 years agoMerge pull request #966 from eileenmcnaughton/enotice
dlobo [Thu, 6 Jun 2013 21:58:42 +0000 (14:58 -0700)]
Merge pull request #966 from eileenmcnaughton/enotice

make ufgroup api tests & api enotice complian

11 years agoCRM-12773 handle null custom fields without fatal
eileen [Thu, 6 Jun 2013 20:55:20 +0000 (08:55 +1200)]
CRM-12773 handle null custom fields without fatal

11 years agoMerge pull request #972 from deepak-srivastava/hr
deepak-srivastava [Thu, 6 Jun 2013 15:07:36 +0000 (08:07 -0700)]
Merge pull request #972 from deepak-srivastava/hr

CRM-12490, section header fixes

11 years agoCRM-12490, section header fixes
Deepak Srivastava [Thu, 6 Jun 2013 13:42:19 +0000 (19:12 +0530)]
CRM-12490, section header fixes

----------------------------------------
* CRM-12490: Add Soft Credit data to the Contribution Detail Report
  http://issues.civicrm.org/jira/browse/CRM-12490

11 years agoMerge pull request #961 from dpradeep/CRM-10983-commit
pratik-joshi [Thu, 6 Jun 2013 13:31:20 +0000 (06:31 -0700)]
Merge pull request #961 from dpradeep/CRM-10983-commit

-- fixed for CRM-10983, prevent the generation of duplicate custom data.

11 years agoMerge pull request #971 from eileenmcnaughton/master
Kurund Jalmi [Thu, 6 Jun 2013 11:07:34 +0000 (04:07 -0700)]
Merge pull request #971 from eileenmcnaughton/master

fix another test regression

11 years agodefault to is_active on custom field api
eileen [Thu, 6 Jun 2013 10:11:54 +0000 (22:11 +1200)]
default to is_active on custom field api

11 years agofix test regression related to name clash not tested action
eileen [Thu, 6 Jun 2013 10:10:58 +0000 (22:10 +1200)]
fix test regression related to name clash not tested action

11 years agoMerge pull request #970 from eileenmcnaughton/apitweaks
Kurund Jalmi [Thu, 6 Jun 2013 09:14:47 +0000 (02:14 -0700)]
Merge pull request #970 from eileenmcnaughton/apitweaks

custom field api should default to 'is_active' = 1

11 years agocustom field api should default to 'is_active' = 1
eileen [Thu, 6 Jun 2013 08:36:15 +0000 (20:36 +1200)]
custom field api should default to 'is_active' = 1

11 years agoMerge pull request #969 from eileenmcnaughton/master
Kurund Jalmi [Thu, 6 Jun 2013 07:07:49 +0000 (00:07 -0700)]
Merge pull request #969 from eileenmcnaughton/master

CRM-12768 - custom api tweak on field spec

11 years agoCRM-12768 custom_file api -default type to 'String' for clarity & enotice
eileen [Thu, 6 Jun 2013 06:27:31 +0000 (18:27 +1200)]
CRM-12768 custom_file api -default type to 'String' for clarity & enotice

11 years agoMerge pull request #968 from eileenmcnaughton/master
Kurund Jalmi [Thu, 6 Jun 2013 05:50:09 +0000 (22:50 -0700)]
Merge pull request #968 from eileenmcnaughton/master

CRM-12768 caused locblock test to fail

11 years agolocblock test fix broken as it was 'taking advantage of' inconsistency in return...
eileen [Thu, 6 Jun 2013 05:29:12 +0000 (17:29 +1200)]
locblock test fix broken as it was 'taking advantage of' inconsistency in return param

11 years agoMerge pull request #967 from ravishnair/CRM-12682
Yashodha Chaku [Thu, 6 Jun 2013 05:05:00 +0000 (22:05 -0700)]
Merge pull request #967 from ravishnair/CRM-12682

-- CRM-12697 cleaned up the usage of removed civicrm_activity column source_contact_id

11 years ago-- CRM-12697 cleaned up the usage of removed civicrm_activity column source_contact_id
Ravish Nair [Thu, 6 Jun 2013 04:43:59 +0000 (10:13 +0530)]
-- CRM-12697 cleaned up the usage of removed civicrm_activity column source_contact_id

11 years agoMerge pull request #958 from pratik-joshi/CRM-10164
Yashodha Chaku [Thu, 6 Jun 2013 04:20:10 +0000 (21:20 -0700)]
Merge pull request #958 from pratik-joshi/CRM-10164

CRM-10164

11 years agomake ufgroup api tests & api enotice complian
eileen [Thu, 6 Jun 2013 04:09:34 +0000 (16:09 +1200)]
make ufgroup api tests & api enotice complian

11 years agoMerge pull request #965 from eileenmcnaughton/CRM-12768
Kurund Jalmi [Thu, 6 Jun 2013 03:51:36 +0000 (20:51 -0700)]
Merge pull request #965 from eileenmcnaughton/CRM-12768

Crm 12768 fix custom field option group handling

11 years agoupdate examples
eileen [Thu, 6 Jun 2013 03:35:42 +0000 (15:35 +1200)]
update examples

11 years agoCRM-12768 fix side-problem where handling of 'return' param inconsistent
eileen [Thu, 6 Jun 2013 03:35:24 +0000 (15:35 +1200)]
CRM-12768 fix side-problem where handling of 'return' param inconsistent

11 years agoCRM-12768 fix & document api option group creation on custom_field.create'
eileen [Thu, 6 Jun 2013 03:34:00 +0000 (15:34 +1200)]
CRM-12768 fix & document api option group creation on custom_field.create'

11 years agoMerge pull request #959 from yashodha/4.4
Kurund Jalmi [Thu, 6 Jun 2013 03:32:57 +0000 (20:32 -0700)]
Merge pull request #959 from yashodha/4.4

CRM-12689

11 years agoclean trailing spaces from tests folder in prep
eileen [Thu, 6 Jun 2013 02:55:11 +0000 (14:55 +1200)]
clean trailing spaces from tests folder in prep

11 years agoCRM-10164 : more clean up
Pratik Joshi [Wed, 5 Jun 2013 14:09:24 +0000 (19:39 +0530)]
CRM-10164 : more clean up

11 years agoMerge pull request #962 from deepak-srivastava/hr
deepak-srivastava [Wed, 5 Jun 2013 13:08:11 +0000 (06:08 -0700)]
Merge pull request #962 from deepak-srivastava/hr

CRM-12490, towards issues raised by dgg

11 years agoCRM-12490, towards issues raised by dgg
Deepak Srivastava [Wed, 5 Jun 2013 12:58:30 +0000 (18:28 +0530)]
CRM-12490, towards issues raised by dgg

----------------------------------------
* CRM-12490: Add Soft Credit data to the Contribution Detail Report
  http://issues.civicrm.org/jira/browse/CRM-12490

11 years agoCRM-12689
yashodha [Wed, 5 Jun 2013 12:46:18 +0000 (18:16 +0530)]
CRM-12689

11 years ago-- fixed for CRM-10983, prevent the generation of duplicate custom data.
dpradeep [Wed, 5 Jun 2013 12:32:15 +0000 (18:02 +0530)]
-- fixed for CRM-10983, prevent the generation of duplicate custom data.

11 years agoCRM-12689
yashodha [Wed, 5 Jun 2013 12:26:48 +0000 (17:56 +0530)]
CRM-12689

11 years agoCRM-10164
Pratik Joshi [Wed, 5 Jun 2013 10:15:45 +0000 (15:45 +0530)]
CRM-10164

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-06-05-06-52-23
Kurund Jalmi [Wed, 5 Jun 2013 06:10:24 +0000 (11:40 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-06-05-06-52-23

Conflicts:
CRM/Case/Form/Activity.php
CRM/Contact/Form/Search/Custom/ContribSYBNT.php
CRM/Contact/Form/Search/Custom/ContributionAggregate.php
CRM/Contact/Form/Search/Custom/EventAggregate.php
CRM/Contact/Form/Search/Custom/PriceSet.php
CRM/Contact/Form/Search/Custom/TagContributions.php
CRM/Core/BAO/ConfigSetting.php
CRM/Financial/BAO/FinancialType.php
CRM/Report/Form.php
CRM/Report/Form/Campaign/SurveyDetails.php
CRM/Report/Form/Contribute/Summary.php
sql/civicrm_generated.mysql
templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php

11 years agoMerge pull request #957 from colemanw/getQuick
Tim Otten [Tue, 4 Jun 2013 23:32:59 +0000 (16:32 -0700)]
Merge pull request #957 from colemanw/getQuick

Escape sql in contact.getquick api

11 years agoMove all escaping from Ajax callback to api CRM-12765
Coleman Watts [Tue, 4 Jun 2013 22:34:36 +0000 (15:34 -0700)]
Move all escaping from Ajax callback to api CRM-12765

11 years agoRemove escaping from ajax callback, it is now handled by api CRM-12765
Coleman Watts [Tue, 4 Jun 2013 19:42:35 +0000 (12:42 -0700)]
Remove escaping from ajax callback, it is now handled by api CRM-12765

11 years agoEscape sql in contact.getquick api CRM-12765
Coleman Watts [Tue, 4 Jun 2013 18:13:43 +0000 (11:13 -0700)]
Escape sql in contact.getquick api CRM-12765

11 years agoMerge pull request #956 from kurund/fix-gendata
Kurund Jalmi [Tue, 4 Jun 2013 16:40:28 +0000 (09:40 -0700)]
Merge pull request #956 from kurund/fix-gendata

fixed incorrect report instance id's in sample dashlets

11 years agoMerge pull request #955 from totten/master-mktest-dbload
Kurund Jalmi [Tue, 4 Jun 2013 16:16:00 +0000 (09:16 -0700)]
Merge pull request #955 from totten/master-mktest-dbload

mk-drupal-test-site - Pass through DBLOAD option

11 years agoMerge pull request #954 from deepak-srivastava/4.3
deepak-srivastava [Tue, 4 Jun 2013 15:44:30 +0000 (08:44 -0700)]
Merge pull request #954 from deepak-srivastava/4.3

php 5.4 notice fixes

11 years agomk-drupal-test-site - Pass through DBLOAD option
Tim Otten [Tue, 4 Jun 2013 15:40:21 +0000 (11:40 -0400)]
mk-drupal-test-site - Pass through DBLOAD option

11 years agofixed incorrect report instance id's in sample dashlets
Kurund Jalmi [Tue, 4 Jun 2013 15:39:13 +0000 (21:09 +0530)]
fixed incorrect report instance id's in sample dashlets

11 years agophp 5.4 notice fixes
Deepak Srivastava [Tue, 4 Jun 2013 15:39:10 +0000 (21:09 +0530)]
php 5.4 notice fixes

11 years agoMerge pull request #953 from pratik-joshi/event-income-summary-report-charts-no-display
Kurund Jalmi [Tue, 4 Jun 2013 15:03:41 +0000 (08:03 -0700)]
Merge pull request #953 from pratik-joshi/event-income-summary-report-charts-no-display

fix for bar chart and pie chart not displaying for event income summary ...

11 years agofix for bar chart and pie chart not displaying for event income summary report
Pratik Joshi [Tue, 4 Jun 2013 14:56:19 +0000 (20:26 +0530)]
fix for bar chart and pie chart not displaying for event income summary report

11 years agoMerge pull request #951 from ravishnair/CRM-12741webtest
Kurund Jalmi [Tue, 4 Jun 2013 13:10:29 +0000 (06:10 -0700)]
Merge pull request #951 from ravishnair/CRM-12741webtest

-- CRM-12741 webtest

11 years agoMerge pull request #952 from deepak-srivastava/hr
deepak-srivastava [Tue, 4 Jun 2013 12:52:19 +0000 (05:52 -0700)]
Merge pull request #952 from deepak-srivastava/hr

CRM-12623, improvements w.r.t custom table joins and notice fixes

11 years agoCRM-12623, improvements w.r.t custom table joins and notice fixes
Deepak Srivastava [Tue, 4 Jun 2013 12:49:57 +0000 (18:19 +0530)]
CRM-12623, improvements w.r.t custom table joins and notice fixes

----------------------------------------
* CRM-12623: Create CiviHR Report Template
  http://issues.civicrm.org/jira/browse/CRM-12623

11 years ago-- CRM-12741 webtest
Ravish Nair [Tue, 4 Jun 2013 07:22:37 +0000 (12:52 +0530)]
-- CRM-12741 webtest

11 years agoMerge pull request #950 from deepak-srivastava/hr
deepak-srivastava [Tue, 4 Jun 2013 07:17:10 +0000 (00:17 -0700)]
Merge pull request #950 from deepak-srivastava/hr

php 5.4, notice fixes

11 years agonotice fixes
Deepak Srivastava [Tue, 4 Jun 2013 07:08:52 +0000 (12:38 +0530)]
notice fixes

11 years agoMerge pull request #949 from totten/gencode-version
Tim Otten [Tue, 4 Jun 2013 02:21:38 +0000 (19:21 -0700)]
Merge pull request #949 from totten/gencode-version

GenCode:

11 years agoGenCode:
Tim Otten [Tue, 4 Jun 2013 01:42:50 +0000 (01:42 +0000)]
GenCode:
 * Remove shell_exec dependency.
 * In the web footer, report the same version number used everywhere else

11 years agoRemove project task from tests CRM-12464
Coleman Watts [Mon, 3 Jun 2013 23:30:43 +0000 (16:30 -0700)]
Remove project task from tests CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoFix creating test objects CRM-12464
Coleman Watts [Mon, 3 Jun 2013 23:08:10 +0000 (16:08 -0700)]
Fix creating test objects CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoFix and extend custom field options test CRM-12464
Coleman Watts [Mon, 3 Jun 2013 22:40:29 +0000 (15:40 -0700)]
Fix and extend custom field options test CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoMerge pull request #947 from dlobo/FormattingFixes
dlobo [Mon, 3 Jun 2013 20:48:58 +0000 (13:48 -0700)]
Merge pull request #947 from dlobo/FormattingFixes

misc fixes while testing ofc and wkhtml

11 years agomisc fixes while testing ofc and wkhtml
Donald A. Lobo [Mon, 3 Jun 2013 20:47:06 +0000 (13:47 -0700)]
misc fixes while testing ofc and wkhtml

11 years agoMerge pull request #946 from dlobo/CRM-12750
colemanw [Mon, 3 Jun 2013 19:38:34 +0000 (12:38 -0700)]
Merge pull request #946 from dlobo/CRM-12750

CRM-12755

11 years agoMerge pull request #944 from pratik-joshi/CRM-12747
dlobo [Mon, 3 Jun 2013 18:02:32 +0000 (11:02 -0700)]
Merge pull request #944 from pratik-joshi/CRM-12747

CRM-12747 : component access permission defining way for end developer

11 years agoMerge pull request #945 from totten/4.3-indent
dlobo [Mon, 3 Jun 2013 17:57:26 +0000 (10:57 -0700)]
Merge pull request #945 from totten/4.3-indent

Fix indentation

11 years agoCRM-12750
Donald A. Lobo [Mon, 3 Jun 2013 16:10:42 +0000 (09:10 -0700)]
CRM-12750

----------------------------------------
* CRM-12750: upgrade smarty to 2.6.27
  http://issues.civicrm.org/jira/browse/CRM-12750

11 years agoFix indentation
Tim Otten [Mon, 3 Jun 2013 15:20:21 +0000 (11:20 -0400)]
Fix indentation

11 years agoCRM-12747 : component access permission defining way for end developer
Pratik Joshi [Mon, 3 Jun 2013 14:54:19 +0000 (20:24 +0530)]
CRM-12747 : component access permission defining way for end developer

11 years agoMerge pull request #943 from kurund/CRM-12752
Kurund Jalmi [Mon, 3 Jun 2013 14:28:00 +0000 (07:28 -0700)]
Merge pull request #943 from kurund/CRM-12752

CRM-12752, check ids instead of label for showing notification checkbox below participant status

11 years agoCRM-12752, check ids instead of label for showing notification checkbox, also code...
Kurund Jalmi [Mon, 3 Jun 2013 13:05:19 +0000 (18:35 +0530)]
CRM-12752, check ids instead of label for showing notification checkbox, also code cleanup

11 years agoremove obsolete code
Kurund Jalmi [Mon, 3 Jun 2013 12:59:41 +0000 (18:29 +0530)]
remove obsolete code

11 years agoMerge pull request #942 from deepak-srivastava/hr
deepak-srivastava [Mon, 3 Jun 2013 12:37:04 +0000 (05:37 -0700)]
Merge pull request #942 from deepak-srivastava/hr

CRM-12622, filters and more valid assertions

11 years agoCRM-12622, filters and more valid assertions
Deepak Srivastava [Mon, 3 Jun 2013 12:35:18 +0000 (18:05 +0530)]
CRM-12622, filters and more valid assertions

----------------------------------------
* CRM-12622: Create example data files for CiviHR Report Template
  http://issues.civicrm.org/jira/browse/CRM-12622

11 years agoMerge pull request #941 from kurund/CRM-12711
Kurund Jalmi [Mon, 3 Jun 2013 10:10:51 +0000 (03:10 -0700)]
Merge pull request #941 from kurund/CRM-12711

removing code that popsup dialog on load in j2,j3 and wp

11 years agoremoving code that popsup dialog on load in j2,j3 and wp
Kurund Jalmi [Mon, 3 Jun 2013 09:59:50 +0000 (15:29 +0530)]
removing code that popsup dialog on load in j2,j3 and wp

11 years agoMerge pull request #930 from colemanw/task.tpl
Kurund Jalmi [Mon, 3 Jun 2013 09:56:17 +0000 (02:56 -0700)]
Merge pull request #930 from colemanw/task.tpl

Fix missing ($) CRM-12711

11 years agoMerge pull request #940 from pratik-joshi/CRM-12741
Kurund Jalmi [Mon, 3 Jun 2013 07:12:23 +0000 (00:12 -0700)]
Merge pull request #940 from pratik-joshi/CRM-12741

CRM-12741 : did event template handing while price set deletion i.e appr...

11 years agoCRM-12741 : did event template handing while price set deletion i.e appropriate messa...
Pratik Joshi [Mon, 3 Jun 2013 06:17:10 +0000 (11:47 +0530)]
CRM-12741 : did event template handing while price set deletion i.e appropriate message display while deleting price set used for event templates so can user is aware of price set / field usage

11 years agoMerge pull request #939 from eileenmcnaughton/CRM-10859
Kurund Jalmi [Mon, 3 Jun 2013 05:04:23 +0000 (22:04 -0700)]
Merge pull request #939 from eileenmcnaughton/CRM-10859

Crm 10859 - whitespace cleanup

11 years agopreliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:28:50 +0000 (15:28 +1200)]
preliminary whitespace cleanup

11 years agopreliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:24:58 +0000 (15:24 +1200)]
preliminary whitespace cleanup

11 years agopreliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:23:18 +0000 (15:23 +1200)]
preliminary whitespace cleanup

11 years agopreliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:14:19 +0000 (15:14 +1200)]
preliminary whitespace cleanup

11 years agopreliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:11:32 +0000 (15:11 +1200)]
preliminary whitespace cleanup

11 years agopreliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:10:03 +0000 (15:10 +1200)]
preliminary whitespace cleanup

11 years agopreliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:06:46 +0000 (15:06 +1200)]
preliminary whitespace cleanup

11 years agoMerge pull request #938 from totten/master-restore-api_v3
Tim Otten [Mon, 3 Jun 2013 02:54:56 +0000 (19:54 -0700)]
Merge pull request #938 from totten/master-restore-api_v3

api_v3_AllTests - Misc

11 years agoapi_v3_ConstantTest - Clearer errors
Tim Otten [Mon, 3 Jun 2013 02:48:26 +0000 (22:48 -0400)]
api_v3_ConstantTest - Clearer errors

11 years agoCRM_Core_DAO - Throw clearer error message about pseudoconstants
Tim Otten [Mon, 3 Jun 2013 02:41:12 +0000 (22:41 -0400)]
CRM_Core_DAO - Throw clearer error message about pseudoconstants

11 years agoCRM_Contact_BAO_Query - Fix batch of regressions in api_v3_ContactTest
Tim Otten [Mon, 3 Jun 2013 02:20:29 +0000 (22:20 -0400)]
CRM_Contact_BAO_Query - Fix batch of regressions in api_v3_ContactTest

11 years agoapi_v3_ACLPermissionTest - Fix PHP fatalwith undefined object
Tim Otten [Mon, 3 Jun 2013 02:19:47 +0000 (22:19 -0400)]
api_v3_ACLPermissionTest - Fix PHP fatalwith undefined object

11 years agoMerge pull request #937 from dlobo/CRM-12745
dlobo [Sun, 2 Jun 2013 13:53:03 +0000 (06:53 -0700)]
Merge pull request #937 from dlobo/CRM-12745

CRM-12745

11 years agoCRM-12745
Donald A. Lobo [Sun, 2 Jun 2013 13:52:15 +0000 (06:52 -0700)]
CRM-12745

----------------------------------------
* CRM-12745: AlterPreferences.php has Bad Characters
  http://issues.civicrm.org/jira/browse/CRM-12745

11 years agoMerge pull request #936 from kurund/CRM-12594
Kurund Jalmi [Sun, 2 Jun 2013 12:12:19 +0000 (05:12 -0700)]
Merge pull request #936 from kurund/CRM-12594

fixed text typo

11 years agofixed text typo
Kurund Jalmi [Sun, 2 Jun 2013 12:10:39 +0000 (17:40 +0530)]
fixed text typo

11 years agoMerge pull request #925 from GiantRobot/CRM-12737
dlobo [Sat, 1 Jun 2013 20:34:23 +0000 (13:34 -0700)]
Merge pull request #925 from GiantRobot/CRM-12737

CRM-12737 - Return a CiviCRM-looking error if we hit a cURL error.

11 years agoMerge pull request #927 from dlobo/CRM-12466
dlobo [Sat, 1 Jun 2013 20:15:24 +0000 (13:15 -0700)]
Merge pull request #927 from dlobo/CRM-12466

CRM-12466 -  Add locking to smart group creation

11 years agoCRM-12466 - force will always reevaluate the query, used in tests
Donald A. Lobo [Fri, 31 May 2013 23:25:47 +0000 (16:25 -0700)]
CRM-12466 - force will always reevaluate the query, used in tests

----------------------------------------
* CRM-12466: Group listings don't load
  http://issues.civicrm.org/jira/browse/CRM-12466

11 years agoMerge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-12466
Donald A. Lobo [Fri, 31 May 2013 23:24:17 +0000 (16:24 -0700)]
Merge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-12466

11 years agoMerge pull request #935 from colemanw/CRM-12743
dlobo [Fri, 31 May 2013 23:11:27 +0000 (16:11 -0700)]
Merge pull request #935 from colemanw/CRM-12743

One last eval CRM-12743

11 years agoOne last eval CRM-12743
Coleman Watts [Fri, 31 May 2013 21:23:04 +0000 (14:23 -0700)]
One last eval CRM-12743

----------------------------------------
* CRM-12743: Eliminate use of eval in core code
  http://issues.civicrm.org/jira/browse/CRM-12743

----------------------------------------
* CRM-12743:
  http://issues.civicrm.org/jira/browse/CRM-12743
* CRM-12743::
  http://issues.civicrm.org/jira/browse/CRM-12743: