From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 4 Jan 2014 00:05:34 +0000 (-0800)
Subject: Merge branch '4.4' of https://github.com/civicrm/civicrm-core
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b5e8537ad99104f37a433de51d5d2abcebb5977c;p=civicrm-core.git

Merge branch '4.4' of https://github.com/civicrm/civicrm-core

Conflicts:
	CRM/Core/BAO/Navigation.php
	xml/schema/Mailing/Event/Bounce.xml
---

b5e8537ad99104f37a433de51d5d2abcebb5977c
diff --cc CRM/Core/BAO/Navigation.php
index 0c7c4c4796,629a0b4d2e..20e5188b42
--- a/CRM/Core/BAO/Navigation.php
+++ b/CRM/Core/BAO/Navigation.php
@@@ -604,36 -623,20 +604,36 @@@ ORDER BY parent_id, weight"
            module_exists('admin_menu') && user_access('access administration menu')
          )
        ) {
-         $prepandString = "<li class=\"menumain crm-link-home\">" . $homeIcon . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . "</a></li><li><a href=\"#\" onclick=\"cj.Menu.closeAll( );cj('#civicrm-menu').toggle( );\">" . ts('Drupal Menu') . "</a></li></ul></li>";
 -        $prepandString = "<li class=\"menumain crm-link-home\">" . $homeLabel . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . "</a></li><li><a href=\"#\" onclick=\"cj.Menu.closeAll( );cj('#civicrm-menu').toggle( );\">" . ts('Drupal Menu') . "</a></li></ul>";
++        $prepandString = "<li class=\"menumain crm-link-home\">" . $homeIcon . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . "</a></li><li><a href=\"#\" onclick=\"cj.Menu.closeAll( );cj('#civicrm-menu').toggle( );\">" . ts('Drupal Menu') . "</a></li></ul>";
        }
        elseif ($config->userSystem->is_wordpress) {
-         $prepandString = "<li class=\"menumain crm-link-home\">" . $homeIcon . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . "</a></li><li><a href=\"#\" onclick=\"cj.Menu.closeAll( );cj('#civicrm-menu').toggle( );\">" . ts('WordPress Menu') . "</a></li></ul></li>";
 -        $prepandString = "<li class=\"menumain crm-link-home\">" . $homeLabel . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . "</a></li><li><a href=\"#\" onclick=\"cj.Menu.closeAll( );cj('#civicrm-menu').toggle( );\">" . ts('WordPress Menu') . "</a></li></ul>";
++        $prepandString = "<li class=\"menumain crm-link-home\">" . $homeIcon . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . "</a></li><li><a href=\"#\" onclick=\"cj.Menu.closeAll( );cj('#civicrm-menu').toggle( );\">" . ts('WordPress Menu') . "</a></li></ul>";
        }
        else {
-         $prepandString = "<li class=\"menumain crm-link-home\"><a href=\"{$homeURL}\" title=\"" . $homeLabel . "\">" . $homeIcon . "</a></li>";
 -        $prepandString = "<li class=\"menumain crm-link-home\"><a href=\"{$homeURL}\" title=\"" . $homeLabel . "\">" . $homeLabel . "</a>";
++        $prepandString = "<li class=\"menumain crm-link-home\"><a href=\"{$homeURL}\" title=\"" . $homeLabel . "\">" . $homeIcon . "</a>";
        }
  
 -      // prepend the navigation with locale info for CRM-5027
 -      $navigation = "<!-- $config->lcMessages -->" . $prepandString . $navigation . $appendSring;
 +      $navigation = $prepandString . $navigation . $appendString;
 +    }
 +    return $navigation;
 +  }
  
 +  /**
 +   * Reset navigation for all contacts or a specified contact
 +   *
 +   * @param integer $contactID - reset only entries belonging to that contact ID
 +   * @return string
 +   */
 +  static function resetNavigation($contactID = NULL) {
 +    $newKey = CRM_Utils_String::createRandom(self::CACHE_KEY_STRLEN, CRM_Utils_String::ALPHANUMERIC);
 +    if (!$contactID) {
 +      $query = "UPDATE civicrm_setting SET value = '$newKey' WHERE name='navigation' AND contact_id IS NOT NULL";
 +      CRM_Core_DAO::executeQuery($query);
 +      CRM_Core_BAO_Cache::deleteGroup('navigation');
 +    }
 +    else {
        // before inserting check if contact id exists in db
 -      // this is to handle wierd case when contact id is in session but not in db
 +      // this is to handle weird case when contact id is in session but not in db
        $contact = new CRM_Contact_DAO_Contact();
        $contact->id = $contactID;
        if ($contact->find(TRUE)) {
diff --cc xml/schema/Activity/Activity.xml
index ab8f34e864,8aec77bebd..4f7c55879a
--- a/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@@ -422,12 -376,8 +422,11 @@@
            <table>civicrm_campaign</table>
            <keyColumn>id</keyColumn>
            <labelColumn>title</labelColumn>
-           <condition>(end_date IS NULL OR end_date > NOW())</condition>
         </pseudoconstant>
         <add>3.4</add>
 +       <html>
 +         <type>CheckBox</type>
 +       </html>
    </field>
    <foreignKey>
         <name>campaign_id</name>
diff --cc xml/schema/Contribute/Contribution.xml
index debdb57d85,bd3c6c62bc..64d1aff602
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@@ -473,12 -404,8 +473,11 @@@
        <table>civicrm_campaign</table>
        <keyColumn>id</keyColumn>
        <labelColumn>title</labelColumn>
-       <condition>(end_date IS NULL OR end_date > NOW())</condition>
      </pseudoconstant>
      <add>3.4</add>
 +    <html>
 +      <type>Select</type>
 +    </html>
    </field>
    <foreignKey>
      <name>campaign_id</name>
diff --cc xml/schema/Event/Event.xml
index 551af2a010,ec43866376..e71e2cb041
--- a/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@@ -746,12 -597,8 +746,11 @@@
        <table>civicrm_campaign</table>
        <keyColumn>id</keyColumn>
        <labelColumn>title</labelColumn>
-       <condition>(end_date IS NULL OR end_date > NOW())</condition>
      </pseudoconstant>
      <add>3.4</add>
 +    <html>
 +       <type>Autocomplete-Select</type>
 +     </html>
    </field>
    <foreignKey>
      <name>campaign_id</name>
diff --cc xml/schema/Mailing/Event/Bounce.xml
index 674f45e1c3,1429267c0c..e634ac8b00
--- a/xml/schema/Mailing/Event/Bounce.xml
+++ b/xml/schema/Mailing/Event/Bounce.xml
@@@ -28,17 -28,14 +28,17 @@@
          <onDelete>CASCADE</onDelete>
      </foreignKey>
      <field>
-         <name>bounce_type_id</name>
-         <type>int unsigned</type>
-         <comment>What type of bounce was it?</comment>
- 	<pseudoconstant>
- 	  <table>civicrm_mailing_bounce_type</table>
- 	  <keyColumn>id</keyColumn>
- 	  <labelColumn>name</labelColumn>
- 	</pseudoconstant>
- <html>
-   <type>Select</type>
- </html>
+       <name>bounce_type_id</name>
+       <type>int unsigned</type>
+       <comment>What type of bounce was it?</comment>
+       <pseudoconstant>
+         <table>civicrm_mailing_bounce_type</table>
+         <keyColumn>id</keyColumn>
+         <labelColumn>name</labelColumn>
+       </pseudoconstant>
++      <html>
++        <type>Select</type>
++      </html>
      </field>
      <field>
          <name>bounce_reason</name>
diff --cc xml/schema/Mailing/Mailing.xml
index 95c1e62d26,27ef77cf92..720a457ba5
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@@ -315,12 -270,8 +315,11 @@@
            <table>civicrm_campaign</table>
            <keyColumn>id</keyColumn>
            <labelColumn>title</labelColumn>
-           <condition>(end_date IS NULL OR end_date > NOW())</condition>
         </pseudoconstant>
         <add>3.4</add>
 +       <html>
 +          <type>Select</type>
 +        </html>
    </field>
    <foreignKey>
         <name>campaign_id</name>
diff --cc xml/schema/Member/Membership.xml
index 0b08320cb7,6e1383faf4..c1c1d52346
--- a/xml/schema/Member/Membership.xml
+++ b/xml/schema/Member/Membership.xml
@@@ -241,12 -208,8 +241,11 @@@
        <table>civicrm_campaign</table>
        <keyColumn>id</keyColumn>
        <labelColumn>title</labelColumn>
-       <condition>(end_date IS NULL OR end_date > NOW())</condition>
      </pseudoconstant>
      <add>3.4</add>
 +    <html>
 +      <type>Select</type>
 +    </html>
    </field>
    <foreignKey>
      <name>campaign_id</name>
diff --cc xml/schema/Pledge/Pledge.xml
index d91eb202df,bc9b4928ba..41ff7f2dd1
--- a/xml/schema/Pledge/Pledge.xml
+++ b/xml/schema/Pledge/Pledge.xml
@@@ -341,12 -281,8 +341,11 @@@
        <table>civicrm_campaign</table>
        <keyColumn>id</keyColumn>
        <labelColumn>title</labelColumn>
-       <condition>(end_date IS NULL OR end_date > NOW())</condition>
      </pseudoconstant>
      <add>3.4</add>
 +    <html>
 +      <type>Select</type>
 +    </html>
    </field>
    <foreignKey>
      <name>campaign_id</name>