per Matt's review

git-svn-id: http://dev.piwik.org/svn/trunk@1773 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/ArchiveProcessing.php

@@ -507,7 +507,9 @@ abstract class Piwik_ArchiveProcessing
 		{
 			$table = $this->tableArchiveBlob;
 		}
-		
+
+		// ignore duplicate idarchive
+		// @see http://dev.piwik.org/trac/ticket/987
 		$query = "INSERT IGNORE INTO ".$table->getTableName()." (idarchive, idsite, date1, date2, period, ts_archived, name, value)
 					VALUES (?,?,?,?,?,?,?,?)";
 		Piwik_Query($query, 

core/View.php

@@ -216,6 +216,8 @@ class Piwik_View implements Piwik_iView
 	{
 		// replace defined constants
 		$buf = get_defined_constants(true);
+
+		// use only the 'Core' PHP constants, e.g., E_ALL, E_STRICT, ...
 		$consts = isset($buf['Core']) ? $buf['Core'] : (isset($buf['mhash']) ? $buf['mhash'] : $buf['internal']);
 		$expression = str_replace(' ', '', strtr($expression, $consts));