Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge PRs that were merged to old branch (1.9.3.1) #181

Merged
merged 9 commits into from
Mar 1, 2017
Merged

Merge PRs that were merged to old branch (1.9.3.1) #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
18b8dcd
Fixes 1px line so is whole block
seansan Jan 5, 2017
45ec965
Added "image" attribute to flat tables
sreichel Jan 19, 2017
75d9162
Added missing table prefix, fixes #162
sreichel Feb 1, 2017
853eaea
Simple improve of Not valid template file debugging
seansan Feb 8, 2017
1ca14c1
Unify string concatenation
tmotyl Feb 8, 2017
7a8658f
Merge pull request #163 from sreichel/hotfix/customer/model/observer/…
Flyingmana Feb 16, 2017
e7f6075
Merge pull request #165 from seansan/patch-21
Flyingmana Feb 16, 2017
233f22f
Merge pull request #161 from sreichel/hotfix/catalog/etc/config/produ…
Flyingmana Feb 16, 2017
cd961c3
Merge pull request #151 from seansan/patch-20
colinmollenhour Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/code/core/Mage/Catalog/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,7 @@
<special_from_date/>
<special_to_date/>
<short_description/>
<image/>
<thumbnail/>
<small_image/>
<image_label/>
Expand Down
3 changes: 2 additions & 1 deletion app/code/core/Mage/Core/Block/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@ public function fetchView($fileName)
if ($includeFilePath != '' && (strpos($includeFilePath, realpath($this->_viewDir)) === 0 || $this->_getAllowSymlinks())) {
include $includeFilePath;
} else {
Mage::log('Not valid template file:'.$fileName, Zend_Log::CRIT, null, true);
$thisClass = get_class($this);
Mage::log('Not valid template file:' . $fileName . ' class: ' . $thisClass, Zend_Log::CRIT, null, true);
}

} catch (Exception $e) {
Expand Down
5 changes: 3 additions & 2 deletions app/code/core/Mage/Customer/Model/Observer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,9 @@ public function quoteSubmitAfter($observer)
*/
public function deleteCustomerFlowPassword()
{
$connection = Mage::getSingleton('core/resource')->getConnection('write');
$resource = Mage::getSingleton('core/resource');
$connection = $resource->getConnection('write');
$condition = array('requested_date < ?' => Mage::getModel('core/date')->date(null, '-1 day'));
$connection->delete($connection->getTableName('customer_flowpassword'), $condition);
$connection->delete($resource->getTableName('customer_flowpassword'), $condition);
}
}
2 changes: 1 addition & 1 deletion skin/adminhtml/default/default/boxes.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ ul.super-product-attributes { padding-left:15px; }
.grid-severity-minor,
.grid-severity-minor span,
.grid-severity-notice,
.grid-severity-notice span { display:block; height:16px; background-image:url(images/bg_notifications.gif); background-repeat:no-repeat; font:bold 10px/16px Arial, Helvetica, sans-serif; text-transform:uppercase; text-align:center; padding:0 0 0 7px; margin:1px 0; white-space:nowrap; color:#fff; }
.grid-severity-notice span { display:block; height:16px; background-image:url(images/bg_notifications.gif); background-repeat:no-repeat; font:bold 10px/16px Arial, Helvetica, sans-serif; text-transform:uppercase; text-align:center; padding:0 0 0 6px; margin:1px 0; white-space:nowrap; color:#fff; }
.grid-severity-critical { background-position:0 0; }
.grid-severity-critical span { background-position:100% 0; padding:0 7px 0 0; }
.grid-severity-major { background-position:0 -16px; }
Expand Down