matomo-org · mattab · Apr 26, 2017 · Apr 9, 2017 · Apr 9, 2017 · Apr 9, 2017
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ This is the Developer Changelog for Piwik platform developers. All changes in ou
 
 The Product Changelog at **[piwik.org/changelog](http://piwik.org/changelog)** lets you see more details about any Piwik release, such as the list of new guides and FAQs, security fixes, and links to all closed issues. 
 
+## Piwik 3.0.4
+
+### New APIs
+* A new event `Db.getActionReferenceColumnsByTable` has been added in case a plugin defines a custom log table which references data to the log_action table 
+* A new JavaScript tracker method `getPiwikUrl` has been added to retrieve the URL of where the Piwik instance is located
+* A new JavaScript tracker method `getCurrentUrl` has been added to retrieve the current URL of the website. 
+
 ## Piwik 3.0.3
 
 ### Breaking Changes

diff --git a/core/FileIntegrity.php b/core/FileIntegrity.php
@@ -65,6 +65,7 @@ protected static function getFilesNotInManifestButExpectedAnyway()
             '.bowerrc',
             '.phpstorm.meta.php',
             'config/config.ini.php',
+            'config/config.php',
             'config/common.ini.php',
             'config/*.config.ini.php',
             'config/manifest.inc.php',

diff --git a/core/Plugin/Dimension/DimensionMetadataProvider.php b/core/Plugin/Dimension/DimensionMetadataProvider.php
@@ -7,6 +7,7 @@
  */
 
 namespace Piwik\Plugin\Dimension;
+use Piwik\Piwik;
 
 /**
  * Provides metadata about dimensions for the LogDataPurger class.
@@ -73,6 +74,22 @@ public function getActionReferenceColumnsByTable()
             }
         }
 
+        /**
+         * Triggered when detecting which log_action entries to keep. Any log tables that use the log_action
+         * table to reference text via an ID should add their table info so no actions that are still in use
+         * will be accidentally deleted.
+         *
+         * **Example**
+         *
+         *     Piwik::addAction('Db.getActionReferenceColumnsByTable', function(&$result) {
+         *         $tableNameUnprefixed = 'log_example';
+         *         $columnNameThatReferencesIdActionInLogActionTable = 'idaction_example';
+         *         $result[$tableNameUnprefixed] = array($columnNameThatReferencesIdActionInLogActionTable);
+         *     });
+         * @param array $result
+         */
+        Piwik::postEvent('Db.getActionReferenceColumnsByTable', array(&$result));
+
         return $result;
     }
 

diff --git a/core/Version.php b/core/Version.php
@@ -20,7 +20,7 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '3.0.3';
+    const VERSION = '3.0.4-b1';
 
     public function isStableVersion($version)
     {

diff --git a/js/piwik.js b/js/piwik.js
@@ -982,7 +982,7 @@ if (typeof JSON_PIWIK !== 'object' && typeof window.JSON === 'object' && window.
     setCustomVariable, getCustomVariable, deleteCustomVariable, storeCustomVariablesInCookie, setCustomDimension, getCustomDimension,
     deleteCustomVariables, deleteCustomDimension, setDownloadExtensions, addDownloadExtensions, removeDownloadExtensions,
     setDomains, setIgnoreClasses, setRequestMethod, setRequestContentType,
-    setReferrerUrl, setCustomUrl, setAPIUrl, setDocumentTitle,
+    setReferrerUrl, setCustomUrl, setAPIUrl, setDocumentTitle, getPiwikUrl, getCurrentUrl,
     setDownloadClasses, setLinkClasses,
     setCampaignNameKey, setCampaignKeywordKey,
     discardHashTag,
@@ -2853,6 +2853,8 @@ if (typeof window.Piwik !== 'object') {
                 return apiUrl;
             }
 
+            trackerUrl = content.toAbsoluteUrl(trackerUrl);
+
             // if eg http://www.example.com/js/tracker.php?version=232323 => http://www.example.com/js/tracker.php
             if (stringContains(trackerUrl, '?')) {
                 var posQuery = trackerUrl.indexOf('?');
@@ -5629,7 +5631,7 @@ if (typeof window.Piwik !== 'object') {
             };
 
             /**
-             * Specify the Piwik server URL
+             * Specify the Piwik tracking URL
              *
              * @param string trackerUrl
              */
@@ -5638,13 +5640,22 @@ if (typeof window.Piwik !== 'object') {
             };
 
             /**
-             * Returns the Piwik server URL
+             * Returns the Piwik tracking URL
              * @returns string
              */
             this.getTrackerUrl = function () {
                 return configTrackerUrl;
             };
 
+            /**
+             * Returns the Piwik server URL.
+             *
+             * @returns string
+             */
+            this.getPiwikUrl = function () {
+                return getPiwikUrlForOverlay(this.getTrackerUrl(), configApiUrl);
+            };
+
             /**
              * Adds a new tracker. All sent requests will be also sent to the given siteId and piwikUrl.
              *
@@ -6141,6 +6152,14 @@ if (typeof window.Piwik !== 'object') {
                 configCustomUrl = resolveRelativeReference(locationHrefAlias, url);
             };
 
+            /**
+             * Returns the current url of the page that is currently being visited. If a custom URL was set, the
+             * previously defined custom URL will be returned.
+             */
+            this.getCurrentUrl = function () {
+                return configCustomUrl || locationHrefAlias;
+            };
+
             /**
              * Override document.title
              *

diff --git a/js/piwik.min.js b/js/piwik.min.js
diff --git a/misc/log-analytics b/misc/log-analytics