Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- #!/bin/bash
- # Patch apllying tool template
- # v0.1.2
- # (c) Copyright 2013. Magento Inc.
- #
- # DO NOT CHANGE ANY LINE IN THIS FILE.
- # 1. Check required system tools
- _check_installed_tools() {
- local missed=""
- until [ -z "$1" ]; do
- type -t $1 >/dev/null 2>/dev/null
- if (( $? != 0 )); then
- missed="$missed $1"
- fi
- shift
- done
- echo $missed
- }
- REQUIRED_UTILS='sed patch'
- MISSED_REQUIRED_TOOLS=`_check_installed_tools $REQUIRED_UTILS`
- if (( `echo $MISSED_REQUIRED_TOOLS | wc -w` > 0 ));
- then
- echo -e "Error! Some required system tools, that are utilized in this sh script, are not installed:\nTool(s) \"$MISSED_REQUIRED_TOOLS\" is(are) missed, please install it(them)."
- exit 1
- fi
- # 2. Determine bin path for system tools
- CAT_BIN=`which cat`
- PATCH_BIN=`which patch`
- SED_BIN=`which sed`
- PWD_BIN=`which pwd`
- BASENAME_BIN=`which basename`
- BASE_NAME=`$BASENAME_BIN "$0"`
- # 3. Help menu
- if [ "$1" = "-?" -o "$1" = "-h" -o "$1" = "--help" ]
- then
- $CAT_BIN << EOFH
- Usage: sh $BASE_NAME [--help] [-R|--revert] [--list]
- Apply embedded patch.
- -R, --revert Revert previously applied embedded patch
- --list Show list of applied patches
- --help Show this help message
- EOFH
- exit 0
- fi
- # 4. Get "revert" flag and "list applied patches" flag
- REVERT_FLAG=
- SHOW_APPLIED_LIST=0
- if [ "$1" = "-R" -o "$1" = "--revert" ]
- then
- REVERT_FLAG=-R
- fi
- if [ "$1" = "--list" ]
- then
- SHOW_APPLIED_LIST=1
- fi
- # 5. File pathes
- CURRENT_DIR=`$PWD_BIN`/
- APP_ETC_DIR=`echo "$CURRENT_DIR""app/etc/"`
- APPLIED_PATCHES_LIST_FILE=`echo "$APP_ETC_DIR""applied.patches.list"`
- # 6. Show applied patches list if requested
- if [ "$SHOW_APPLIED_LIST" -eq 1 ] ; then
- echo -e "Applied/reverted patches list:"
- if [ -e "$APPLIED_PATCHES_LIST_FILE" ]
- then
- if [ ! -r "$APPLIED_PATCHES_LIST_FILE" ]
- then
- echo "ERROR: \"$APPLIED_PATCHES_LIST_FILE\" must be readable so applied patches list can be shown."
- exit 1
- else
- $SED_BIN -n "/SUP-\|SUPEE-/p" $APPLIED_PATCHES_LIST_FILE
- fi
- else
- echo "<empty>"
- fi
- exit 0
- fi
- # 7. Check applied patches track file and its directory
- _check_files() {
- if [ ! -e "$APP_ETC_DIR" ]
- then
- echo "ERROR: \"$APP_ETC_DIR\" must exist for proper tool work."
- exit 1
- fi
- if [ ! -w "$APP_ETC_DIR" ]
- then
- echo "ERROR: \"$APP_ETC_DIR\" must be writeable for proper tool work."
- exit 1
- fi
- if [ -e "$APPLIED_PATCHES_LIST_FILE" ]
- then
- if [ ! -w "$APPLIED_PATCHES_LIST_FILE" ]
- then
- echo "ERROR: \"$APPLIED_PATCHES_LIST_FILE\" must be writeable for proper tool work."
- exit 1
- fi
- fi
- }
- _check_files
- # 8. Apply/revert patch
- # Note: there is no need to check files permissions for files to be patched.
- # "patch" tool will not modify any file if there is not enough permissions for all files to be modified.
- # Get start points for additional information and patch data
- SKIP_LINES=$((`$SED_BIN -n "/^__PATCHFILE_FOLLOWS__$/=" "$CURRENT_DIR""$BASE_NAME"` + 1))
- ADDITIONAL_INFO_LINE=$(($SKIP_LINES - 3))p
- _apply_revert_patch() {
- DRY_RUN_FLAG=
- if [ "$1" = "dry-run" ]
- then
- DRY_RUN_FLAG=" --dry-run"
- echo "Checking if patch can be applied/reverted successfully..."
- fi
- PATCH_APPLY_REVERT_RESULT=`$SED_BIN -e '1,/^__PATCHFILE_FOLLOWS__$/d' "$CURRENT_DIR""$BASE_NAME" | $PATCH_BIN $DRY_RUN_FLAG $REVERT_FLAG -p0`
- PATCH_APPLY_REVERT_STATUS=$?
- if [ $PATCH_APPLY_REVERT_STATUS -eq 1 ] ; then
- echo -e "ERROR: Patch can't be applied/reverted successfully.\n\n$PATCH_APPLY_REVERT_RESULT"
- exit 1
- fi
- if [ $PATCH_APPLY_REVERT_STATUS -eq 2 ] ; then
- echo -e "ERROR: Patch can't be applied/reverted successfully."
- exit 2
- fi
- }
- REVERTED_PATCH_MARK=
- if [ -n "$REVERT_FLAG" ]
- then
- REVERTED_PATCH_MARK=" | REVERTED"
- fi
- _apply_revert_patch dry-run
- _apply_revert_patch
- # 9. Track patch applying result
- echo "Patch was applied/reverted successfully."
- ADDITIONAL_INFO=`$SED_BIN -n ""$ADDITIONAL_INFO_LINE"" "$CURRENT_DIR""$BASE_NAME"`
- APPLIED_REVERTED_ON_DATE=`date -u +"%F %T UTC"`
- APPLIED_REVERTED_PATCH_INFO=`echo -n "$APPLIED_REVERTED_ON_DATE"" | ""$ADDITIONAL_INFO""$REVERTED_PATCH_MARK"`
- echo -e "$APPLIED_REVERTED_PATCH_INFO\n$PATCH_APPLY_REVERT_RESULT\n\n" >> "$APPLIED_PATCHES_LIST_FILE"
- exit 0
- SUPEE-9465 | EE_1.14.3.0 | v1 | 7d25fe4a71ddef999149201624e0ad573697df8c | Sat Nov 26 04:20:37 2016 +0200 | v1.14.3.0..HEAD
- __PATCHFILE_FOLLOWS__
- diff --git app/code/core/Enterprise/PageCache/Model/Processor/Category.php app/code/core/Enterprise/PageCache/Model/Processor/Category.php
- index 2677e73..7d86127 100644
- --- app/code/core/Enterprise/PageCache/Model/Processor/Category.php
- +++ app/code/core/Enterprise/PageCache/Model/Processor/Category.php
- @@ -49,6 +49,8 @@ class Enterprise_PageCache_Model_Processor_Category extends Enterprise_PageCache
- * Filter input parameters using parameters map
- * @param array $inputParameters
- *
- + * @deprecated
- + *
- * @return array
- */
- protected function _filterInputParameters($inputParameters)
- @@ -97,9 +99,9 @@ class Enterprise_PageCache_Model_Processor_Category extends Enterprise_PageCache
- $sessionParams = Enterprise_PageCache_Model_Cookie::getCategoryCookieValue();
- if ($sessionParams) {
- - $sessionParams = $this->_filterInputParameters((array)json_decode($sessionParams));
- + $sessionParams = (array)json_decode($sessionParams);
- foreach ($sessionParams as $key => $value) {
- - if (!isset($queryParams[$key])) {
- + if (in_array($key, $this->_paramsMap) && !isset($queryParams[$key])) {
- $queryParams[$key] = $value;
- }
- }
- @@ -158,7 +160,7 @@ class Enterprise_PageCache_Model_Processor_Category extends Enterprise_PageCache
- $queryParams = json_decode($this->_getQueryParams(), true);
- if (empty($queryParams)) {
- $queryParams = Enterprise_PageCache_Model_Cookie::getCategoryCookieValue();
- - $queryParams = $this->_filterInputParameters(json_decode($queryParams, true));
- + $queryParams = json_decode($queryParams, true);
- }
- if (is_array($queryParams) && !empty($queryParams)) {
- @@ -180,7 +182,7 @@ class Enterprise_PageCache_Model_Processor_Category extends Enterprise_PageCache
- protected function _getQueryParams()
- {
- if (is_null($this->_queryParams)) {
- - $queryParams = array_merge($this->_filterInputParameters($this->_getSessionParams()), $_GET);
- + $queryParams = array_merge($this->_getSessionParams(), $_GET);
- ksort($queryParams);
- $this->_queryParams = json_encode($queryParams);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement