Merge branch 'MAGETWO-32092-html-profiler-static-resource' into MAGETWO-34649-private-content-profiler

eddielau · eddielau · commit 8498059e2f28 · 2015-02-27T11:52:22.000-06:00
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -99,6 +99,8 @@ public function __construct(
      */
     public function launch()
     {
+        // disabling profiling when retrieving static resource
+        \Magento\Framework\Profiler::reset();
         $appMode = $this->state->getMode();
         if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION) {
             $this->response->setHttpResponseCode(404);

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@ public function __construct(`
`99`	`99`	`*/`
`100`	`100`	`public function launch()`
`101`	`101`	`{`
	`102`	`+ // disabling profiling when retrieving static resource`
	`103`	`+ \Magento\Framework\Profiler::reset();`
`102`	`104`	`$appMode = $this->state->getMode();`
`103`	`105`	`if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION) {`
`104`	`106`	`$this->response->setHttpResponseCode(404);`