diff options
10 files changed, 103 insertions, 110 deletions
diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php index a537c34a59..43c96910c8 100644 --- a/core/Tracker/Action.php +++ b/core/Tracker/Action.php @@ -291,20 +291,22 @@ abstract class Action 'time_spent_ref_action' => $timeSpentReferrerAction ); + foreach($this->actionIdsCached as $field => $idAction) { + $insert[$field] = $idAction; + } + $customValue = $this->getCustomFloatValue(); if (!empty($customValue)) { $insert[self::DB_COLUMN_CUSTOM_FLOAT] = $customValue; } $customVariables = $this->getCustomVariables(); - if (!empty($customVariables)) { Common::printDebug("Page level Custom Variables: "); Common::printDebug($customVariables); } $insert = array_merge($insert, $customVariables); - $fields = implode(", ", array_keys($insert)); $bind = array_values($insert); $values = Common::getSqlStringFieldsArray($insert); @@ -59,6 +59,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Tracker/PageUrl.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/TableLogAction.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Action.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionClickUrl.php'; +require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionEvent.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionPageview.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionSiteSearch.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Request.php'; diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml index e2f0dac23e..3592b74be5 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml @@ -43,9 +43,9 @@ <result prettyDate="Sunday 3 January 2010"> <row> <label>/movies</label> - <nb_visits>4</nb_visits> - <nb_hits>20</nb_hits> - <avg_time_on_page>00:38:00</avg_time_on_page> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0s</avg_time_generation> @@ -53,8 +53,8 @@ <row> <label>/webradio</label> <nb_visits>2</nb_visits> - <nb_hits>14</nb_hits> - <avg_time_on_page>00:29:00</avg_time_on_page> + <nb_hits>2</nb_hits> + <avg_time_on_page>00:24:59</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0s</avg_time_generation> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_day.xml index 9852ba7c18..1b54b1e03d 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_day.xml @@ -2,18 +2,13 @@ <result> <row> <label>/movies</label> - <nb_visits>4</nb_visits> + <nb_visits>2</nb_visits> <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>20</nb_hits> - <sum_time_spent>9120</sum_time_spent> - <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>8</entry_nb_actions> - <entry_sum_visit_length>5522</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> - <exit_nb_visits>4</exit_nb_visits> - <avg_time_on_page>2280</avg_time_on_page> + <exit_nb_visits>2</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/movies</url> @@ -22,14 +17,14 @@ <label>/webradio</label> <nb_visits>2</nb_visits> <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>14</nb_hits> - <sum_time_spent>3480</sum_time_spent> + <nb_hits>2</nb_hits> + <sum_time_spent>2998</sum_time_spent> <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>26</entry_nb_actions> - <entry_sum_visit_length>7082</entry_sum_visit_length> + <entry_nb_actions>30</entry_nb_actions> + <entry_sum_visit_length>7202</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>1740</avg_time_on_page> + <avg_time_on_page>1499</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/webradio</url> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_month.xml index b575bcaac4..2db3c76eaa 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_month.xml @@ -2,18 +2,13 @@ <result> <row> <label>/movies</label> - <nb_visits>4</nb_visits> - <nb_hits>20</nb_hits> - <sum_time_spent>9120</sum_time_spent> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>8</entry_nb_actions> - <entry_sum_visit_length>5522</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>2</exit_nb_visits> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>2280</avg_time_on_page> + <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/movies</url> @@ -21,15 +16,15 @@ <row> <label>/webradio</label> <nb_visits>2</nb_visits> - <nb_hits>14</nb_hits> - <sum_time_spent>3480</sum_time_spent> + <nb_hits>2</nb_hits> + <sum_time_spent>2998</sum_time_spent> <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>26</entry_nb_actions> - <entry_sum_visit_length>7082</entry_sum_visit_length> + <entry_nb_actions>30</entry_nb_actions> + <entry_sum_visit_length>7202</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> - <avg_time_on_page>1740</avg_time_on_page> + <avg_time_on_page>1499</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/webradio</url> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_day.xml index ed299b9781..210a13e4f3 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>34</nb_pageviews> - <nb_uniq_pageviews>6</nb_uniq_pageviews> + <nb_pageviews>4</nb_pageviews> + <nb_uniq_pageviews>4</nb_uniq_pageviews> <nb_downloads>0</nb_downloads> <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_month.xml index ed299b9781..210a13e4f3 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>34</nb_pageviews> - <nb_uniq_pageviews>6</nb_uniq_pageviews> + <nb_pageviews>4</nb_pageviews> + <nb_uniq_pageviews>4</nb_uniq_pageviews> <nb_downloads>0</nb_downloads> <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 12eab4ba0d..13bb1e069f 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -17,7 +17,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>16</pageId> @@ -28,7 +28,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>17</pageId> @@ -39,7 +39,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>18</pageId> @@ -50,7 +50,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>19</pageId> @@ -161,7 +161,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>2</pageId> @@ -178,7 +178,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>3</pageId> @@ -195,7 +195,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>4</pageId> @@ -212,7 +212,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>5</pageId> @@ -229,7 +229,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>6</pageId> @@ -246,7 +246,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>7</pageId> @@ -264,7 +264,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>8</pageId> @@ -293,7 +293,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Princess Mononoke (もののけ姫)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>10</pageId> @@ -304,7 +304,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Ponyo (崖の上のポニョ)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>11</pageId> @@ -315,7 +315,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>12</pageId> @@ -326,7 +326,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>13</pageId> @@ -337,7 +337,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>14</pageId> @@ -348,7 +348,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>15</pageId> @@ -447,7 +447,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>35</pageId> @@ -458,7 +458,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>36</pageId> @@ -469,7 +469,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>37</pageId> @@ -480,7 +480,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>38</pageId> @@ -587,7 +587,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>21</pageId> @@ -604,7 +604,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>22</pageId> @@ -621,7 +621,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>23</pageId> @@ -638,7 +638,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>24</pageId> @@ -655,7 +655,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>25</pageId> @@ -672,7 +672,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>26</pageId> @@ -690,7 +690,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>27</pageId> @@ -719,7 +719,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Princess Mononoke (もののけ姫)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>29</pageId> @@ -730,7 +730,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Ponyo (崖の上のポニョ)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>30</pageId> @@ -741,7 +741,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>31</pageId> @@ -752,7 +752,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>32</pageId> @@ -763,7 +763,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>33</pageId> @@ -774,7 +774,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>34</pageId> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 12eab4ba0d..13bb1e069f 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -17,7 +17,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>16</pageId> @@ -28,7 +28,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>17</pageId> @@ -39,7 +39,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>18</pageId> @@ -50,7 +50,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>19</pageId> @@ -161,7 +161,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>2</pageId> @@ -178,7 +178,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>3</pageId> @@ -195,7 +195,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>4</pageId> @@ -212,7 +212,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>5</pageId> @@ -229,7 +229,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>6</pageId> @@ -246,7 +246,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>7</pageId> @@ -264,7 +264,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>8</pageId> @@ -293,7 +293,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Princess Mononoke (もののけ姫)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>10</pageId> @@ -304,7 +304,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Ponyo (崖の上のポニョ)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>11</pageId> @@ -315,7 +315,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>12</pageId> @@ -326,7 +326,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>13</pageId> @@ -337,7 +337,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>14</pageId> @@ -348,7 +348,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>15</pageId> @@ -447,7 +447,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>35</pageId> @@ -458,7 +458,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>36</pageId> @@ -469,7 +469,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>37</pageId> @@ -480,7 +480,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>38</pageId> @@ -587,7 +587,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>21</pageId> @@ -604,7 +604,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>22</pageId> @@ -621,7 +621,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>23</pageId> @@ -638,7 +638,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>24</pageId> @@ -655,7 +655,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>25</pageId> @@ -672,7 +672,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>26</pageId> @@ -690,7 +690,7 @@ <row> <type>action</type> <url>http://example.org/webradio</url> - <pageTitle /> + <pageTitle>La fiancée de l&#039;eau</pageTitle> <pageIdAction>2</pageIdAction> <pageId>27</pageId> @@ -719,7 +719,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Princess Mononoke (もののけ姫)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>29</pageId> @@ -730,7 +730,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Ponyo (崖の上のポニョ)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>30</pageId> @@ -741,7 +741,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>31</pageId> @@ -752,7 +752,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>32</pageId> @@ -763,7 +763,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>33</pageId> @@ -774,7 +774,7 @@ <row> <type>action</type> <url>http://example.org/movies</url> - <pageTitle /> + <pageTitle>Spirited Away (千と千尋の神隠し)</pageTitle> <pageIdAction>12</pageIdAction> <pageId>34</pageId> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index c5d62ec03d..a8d5257894 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -18,7 +18,7 @@ <h2 style="color: rgb(126,115,99); font-size: 11pt;"> Report list </h2> - <ul>` + <ul> <li> <a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(68,68,68);"> All Websites dashboard |