Import Magento Release 1.9.2.0

To cleanly import this release, two previous commits had to be reverted.
The reverted commit were both Magento security patches that are part of the 1.9.2.0 release.
This reverts commit 3fa52d5.
This reverts commit 7ef5026.

Author: LeeSaferite

RELEASE_NOTES.txt

@@ -1,3 +1,14 @@
+==== 1.9.2.0 ====
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+] NOTE: Current Release Notes are maintained at:                                                                              [
+]                                                                                                                             [
+] http://merch.docs.magento.com/ce/user_guide/Magento_Community_Edition_User_Guide.html#magento/release-notes-ce-1.9.2.html   [
+]                                                                                                                             [
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+==== 1.9.1.0 ====
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ] NOTE: Current Release Notes are maintained at:                                 [

api.php

@@ -28,14 +28,20 @@
     echo 'It looks like you have an invalid PHP version. Magento supports PHP 5.2.0 or newer';
     exit;
 }
-error_reporting(E_ALL | E_STRICT);
 
-$mageFilename = getcwd() . '/app/Mage.php';
+$magentoRootDir = getcwd();
+$bootstrapFilename = $magentoRootDir . '/app/bootstrap.php';
+$mageFilename = $magentoRootDir . '/app/Mage.php';
 
+if (!file_exists($bootstrapFilename)) {
+    echo 'Bootstrap file not found';
+    exit;
+}
 if (!file_exists($mageFilename)) {
     echo 'Mage file not found';
     exit;
 }
+require $bootstrapFilename;
 require $mageFilename;
 
 if (!Mage::isInstalled()) {
@@ -49,8 +55,6 @@
 
 #ini_set('display_errors', 1);
 
-// emulate index.php entry point for correct URLs generation in API
-Mage::register('custom_entry_point', true);
 Mage::$headersSentThrowsException = false;
 Mage::init('admin');
 Mage::app()->loadAreaPart(Mage_Core_Model_App_Area::AREA_GLOBAL, Mage_Core_Model_App_Area::PART_EVENTS);
@@ -61,6 +65,8 @@
 
 // check request could be processed by API2
 if (in_array($apiAlias, Mage_Api2_Model_Server::getApiTypes())) {
+    // emulate index.php entry point for correct URLs generation in API
+    Mage::register('custom_entry_point', true);
     /** @var $server Mage_Api2_Model_Server */
     $server = Mage::getSingleton('api2/server');
 
@@ -76,6 +82,8 @@
     }
     try {
         $server->initialize($adapterCode);
+        // emulate index.php entry point for correct URLs generation in API
+        Mage::register('custom_entry_point', true);
         $server->run();
 
         Mage::app()->getResponse()->sendResponse();

app/Mage.php

@@ -170,8 +170,8 @@ public static function getVersionInfo()
         return array(
             'major'     => '1',
             'minor'     => '9',
-            'revision'  => '1',
-            'patch'     => '1',
+            'revision'  => '2',
+            'patch'     => '0',
             'stability' => '',
             'number'    => '',
         );
@@ -814,12 +814,12 @@ public static function log($message, $level = null, $file = '', $forceLog = fals
 
                 if (!is_dir($logDir)) {
                     mkdir($logDir);
-                    chmod($logDir, 0777);
+                    chmod($logDir, 0750);
                 }
 
                 if (!file_exists($logFile)) {
                     file_put_contents($logFile, '');
-                    chmod($logFile, 0777);
+                    chmod($logFile, 0640);
                 }
 
                 $format = '%timestamp% %priorityName% (%priority%): %message%' . PHP_EOL;

app/bootstrap.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage
+ * @copyright  Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Apply workaround for the libxml PHP bugs:
+ * @link https://bugs.php.net/bug.php?id=62577
+ * @link https://bugs.php.net/bug.php?id=64938
+ */
+if (function_exists('libxml_disable_entity_loader')) {
+    libxml_disable_entity_loader(false);
+}