MAGETWO-32029: Update Framework/Config/Theme and Magento/Core/Model/Theme/Collection.php

Joan He · Joan He · commit f21717e7a230 · 2014-12-22T16:10:26.000-06:00
diff --git a/lib/internal/Magento/Framework/Config/Theme.php b/lib/internal/Magento/Framework/Config/Theme.php
@@ -45,7 +45,7 @@ public function getSchemaFile()
     }
 
     /**
-     * Extract configuration data from theme.xml and composer.json
+     * Extract configuration data from theme.xml
      *
      * @param string $configContent
      * @return array

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function getSchemaFile()`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`48`		`- * Extract configuration data from theme.xml and composer.json`
	`48`	`+ * Extract configuration data from theme.xml`
`49`	`49`	`*`
`50`	`50`	`* @param string $configContent`
`51`	`51`	`* @return array`