Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-08-28

Conflicts:
	CRM/Core/Page.php

diff --cc CRM/Core/Page.php
index 45eba2a15a1dcc0d27e87f3bc2ed7d1434a178fe,522b3cae73c86b4624d3a0e9536b9ac288f18187..63fe8b4d0f8799bceedd0b9419be0d9b0a81db80
--- 1/CRM/Core/Page.php
--- 2/CRM/Core/Page.php
+++ b/CRM/Core/Page.php
@@@ -221,20 -191,17 +221,20 @@@ class CRM_Core_Page 
  
      $config = CRM_Core_Config::singleton();
  
 -    // TODO: Is there a better way to ensure these actions don't happen during AJAX requests?
 -    if (empty($_GET['snippet'])) {
 -      // Version check and intermittent alert to admins
 -      CRM_Utils_VersionCheck::singleton()->versionAlert();
 -      CRM_Utils_Check::singleton()->showPeriodicAlerts();
 +    // Version check and intermittent alert to admins
 +    CRM_Utils_VersionCheck::singleton()->versionAlert();
-     CRM_Utils_Check_Security::singleton()->showPeriodicAlerts();
++    CRM_Utils_Check::singleton()->showPeriodicAlerts();
  
 -      // Debug msg once per hour
 -      if ($config->debug && CRM_Core_Permission::check('administer CiviCRM') && CRM_Core_Session::singleton()->timer('debug_alert', 3600)) {
 -        $msg = ts('Warning: Debug is enabled in <a href="%1">system settings</a>. This should not be enabled on production servers.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/debug', 'reset=1')));
 -        CRM_Core_Session::setStatus($msg, ts('Debug Mode'));
 -      }
 +    // Debug msg once per hour
 +    if ($config->debug && CRM_Core_Permission::check('administer CiviCRM') && CRM_Core_Session::singleton()->timer('debug_alert', 3600)) {
 +      $msg = ts('Warning: Debug is enabled in <a href="%1">system settings</a>. This should not be enabled on production servers.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/debug', 'reset=1')));
 +      CRM_Core_Session::setStatus($msg, ts('Debug Mode'));
 +    }
 +
 +    if ($this->useLivePageJS &&
 +      CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'ajaxPopupsEnabled', NULL, TRUE))
 +    {
 +      CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
      }
  
      $content = self::$_template->fetch('CRM/common/' . strtolower($config->userFramework) . '.tpl');

diff --cc CRM/Utils/Check/Message.php
Simple merge

diff --cc CRM/Utils/Check/Security.php
Simple merge

diff --cc api/v3/System.php
Simple merge

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge