merge & tag 1.4.3

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7597 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/addon/queries/getMAddonIsActivated.xml

@@ -0,0 +1,12 @@
+<query id="getMAddonIsActivated" action="select">
+    <tables>
+      <table name="addons" />
+    </tables>
+    <columns>
+      <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+      <condition operation="equal" column="addon" var="addon" notnull="notnull" />
+      <condition operation="equal" column="is_used_m" default="Y" notnull="notnull" pipe="and" />
+    </conditions>
+</query>

modules/addon/queries/getSiteAddonIsActivated.xml

@@ -1,4 +1,4 @@
-<query id="getAddonIsActivated" action="select">
+<query id="getSiteAddonIsActivated" action="select">
     <tables>
       <table name="addons_site" />
     </tables>

modules/addon/queries/getSiteMAddonIsActivated.xml

@@ -0,0 +1,13 @@
+<query id="getSiteMAddonIsActivated" action="select">
+    <tables>
+      <table name="addons_site" />
+    </tables>
+    <columns>
+      <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+      <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+      <condition operation="equal" column="addon" var="addon" notnull="notnull" pipe="and" />
+      <condition operation="equal" column="is_used_m" default="Y" notnull="notnull" pipe="and" />
+    </conditions>
+</query>

modules/addon/queries/updateAddon.xml

@@ -4,6 +4,7 @@
     </tables>
     <columns>
       <column name="is_used" var="is_used" />
+      <column name="is_used_m" var="is_used_m" />
       <column name="extra_vars" var="extra_vars" />
     </columns>
     <conditions>

modules/addon/queries/updateSiteAddon.xml

@@ -4,6 +4,7 @@
     </tables>
     <columns>
       <column name="is_used" var="is_used" />
+      <column name="is_used_m" var="is_used_m" />
       <column name="extra_vars" var="extra_vars" />
     </columns>
     <conditions>