Skip to content

Commit 1cb9e1a

Browse files
sreichelsreichel
authored
Merge branch 'main' into fix/4740
2 parents 4d03fc0 + 303ffdb commit 1cb9e1a

File tree

17 files changed

+298
-4
lines changed

17 files changed

+298
-4
lines changed

‎.all-contributorsrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,6 +1707,15 @@
17071707
"contributions": [
17081708
"bug"
17091709
]
1710+
},
1711+
{
1712+
"login": "warleyelias",
1713+
"name": "Warley Elias",
1714+
"avatar_url": "https://avatars.githubusercontent.com/u/5356619?v=4",
1715+
"profile": "https://www.linkedin.com/in/warley-elias-531a4116/",
1716+
"contributions": [
1717+
"code"
1718+
]
17101719
}
17111720
],
17121721
"commitType": "docs"

‎.phpstorm.meta.php/magento_blocks.meta.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@
595595
'adminhtml/system_config_form_field_heading' => \Mage_Adminhtml_Block_System_Config_Form_Field_Heading::class,
596596
'adminhtml/system_config_form_field_image' => \Mage_Adminhtml_Block_System_Config_Form_Field_Image::class,
597597
'adminhtml/system_config_form_field_import' => \Mage_Adminhtml_Block_System_Config_Form_Field_Import::class,
598+
'adminhtml/system_config_form_field_logo' => \Mage_Adminhtml_Block_System_Config_Form_Field_Logo::class,
598599
'adminhtml/system_config_form_field_notification' => \Mage_Adminhtml_Block_System_Config_Form_Field_Notification::class,
599600
'adminhtml/system_config_form_field_regexceptions' => \Mage_Adminhtml_Block_System_Config_Form_Field_Regexceptions::class,
600601
'adminhtml/system_config_form_field_select_allowspecific' => \Mage_Adminhtml_Block_System_Config_Form_Field_Select_Allowspecific::class,

‎.phpstorm.meta.php/magento_blocks_methods.meta.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@
595595
'adminhtml/system_config_form_field_heading' => \Mage_Adminhtml_Block_System_Config_Form_Field_Heading::class,
596596
'adminhtml/system_config_form_field_image' => \Mage_Adminhtml_Block_System_Config_Form_Field_Image::class,
597597
'adminhtml/system_config_form_field_import' => \Mage_Adminhtml_Block_System_Config_Form_Field_Import::class,
598+
'adminhtml/system_config_form_field_logo' => \Mage_Adminhtml_Block_System_Config_Form_Field_Logo::class,
598599
'adminhtml/system_config_form_field_notification' => \Mage_Adminhtml_Block_System_Config_Form_Field_Notification::class,
599600
'adminhtml/system_config_form_field_regexceptions' => \Mage_Adminhtml_Block_System_Config_Form_Field_Regexceptions::class,
600601
'adminhtml/system_config_form_field_select_allowspecific' => \Mage_Adminhtml_Block_System_Config_Form_Field_Select_Allowspecific::class,

‎.phpstorm.meta.php/magento_helpers.meta.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
'catalog/image' => \Mage_Catalog_Helper_Image::class,
5757
'catalog/map' => \Mage_Catalog_Helper_Map::class,
5858
'catalog/output' => \Mage_Catalog_Helper_Output::class,
59+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
5960
'catalog/product' => \Mage_Catalog_Helper_Product::class,
6061
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
6162
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,

‎.phpstorm.meta.php/magento_helpers_methods.meta.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
'catalog/image' => \Mage_Catalog_Helper_Image::class,
5757
'catalog/map' => \Mage_Catalog_Helper_Map::class,
5858
'catalog/output' => \Mage_Catalog_Helper_Output::class,
59+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
5960
'catalog/product' => \Mage_Catalog_Helper_Product::class,
6061
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
6162
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -253,6 +254,7 @@
253254
'catalog/image' => \Mage_Catalog_Helper_Image::class,
254255
'catalog/map' => \Mage_Catalog_Helper_Map::class,
255256
'catalog/output' => \Mage_Catalog_Helper_Output::class,
257+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
256258
'catalog/product' => \Mage_Catalog_Helper_Product::class,
257259
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
258260
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -450,6 +452,7 @@
450452
'catalog/image' => \Mage_Catalog_Helper_Image::class,
451453
'catalog/map' => \Mage_Catalog_Helper_Map::class,
452454
'catalog/output' => \Mage_Catalog_Helper_Output::class,
455+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
453456
'catalog/product' => \Mage_Catalog_Helper_Product::class,
454457
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
455458
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -647,6 +650,7 @@
647650
'catalog/image' => \Mage_Catalog_Helper_Image::class,
648651
'catalog/map' => \Mage_Catalog_Helper_Map::class,
649652
'catalog/output' => \Mage_Catalog_Helper_Output::class,
653+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
650654
'catalog/product' => \Mage_Catalog_Helper_Product::class,
651655
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
652656
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -844,6 +848,7 @@
844848
'catalog/image' => \Mage_Catalog_Helper_Image::class,
845849
'catalog/map' => \Mage_Catalog_Helper_Map::class,
846850
'catalog/output' => \Mage_Catalog_Helper_Output::class,
851+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
847852
'catalog/product' => \Mage_Catalog_Helper_Product::class,
848853
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
849854
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -1041,6 +1046,7 @@
10411046
'catalog/image' => \Mage_Catalog_Helper_Image::class,
10421047
'catalog/map' => \Mage_Catalog_Helper_Map::class,
10431048
'catalog/output' => \Mage_Catalog_Helper_Output::class,
1049+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
10441050
'catalog/product' => \Mage_Catalog_Helper_Product::class,
10451051
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
10461052
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -1238,6 +1244,7 @@
12381244
'catalog/image' => \Mage_Catalog_Helper_Image::class,
12391245
'catalog/map' => \Mage_Catalog_Helper_Map::class,
12401246
'catalog/output' => \Mage_Catalog_Helper_Output::class,
1247+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
12411248
'catalog/product' => \Mage_Catalog_Helper_Product::class,
12421249
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
12431250
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -1435,6 +1442,7 @@
14351442
'catalog/image' => \Mage_Catalog_Helper_Image::class,
14361443
'catalog/map' => \Mage_Catalog_Helper_Map::class,
14371444
'catalog/output' => \Mage_Catalog_Helper_Output::class,
1445+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
14381446
'catalog/product' => \Mage_Catalog_Helper_Product::class,
14391447
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
14401448
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -1632,6 +1640,7 @@
16321640
'catalog/image' => \Mage_Catalog_Helper_Image::class,
16331641
'catalog/map' => \Mage_Catalog_Helper_Map::class,
16341642
'catalog/output' => \Mage_Catalog_Helper_Output::class,
1643+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
16351644
'catalog/product' => \Mage_Catalog_Helper_Product::class,
16361645
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
16371646
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -1829,6 +1838,7 @@
18291838
'catalog/image' => \Mage_Catalog_Helper_Image::class,
18301839
'catalog/map' => \Mage_Catalog_Helper_Map::class,
18311840
'catalog/output' => \Mage_Catalog_Helper_Output::class,
1841+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
18321842
'catalog/product' => \Mage_Catalog_Helper_Product::class,
18331843
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
18341844
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -2026,6 +2036,7 @@
20262036
'catalog/image' => \Mage_Catalog_Helper_Image::class,
20272037
'catalog/map' => \Mage_Catalog_Helper_Map::class,
20282038
'catalog/output' => \Mage_Catalog_Helper_Output::class,
2039+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
20292040
'catalog/product' => \Mage_Catalog_Helper_Product::class,
20302041
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
20312042
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -2223,6 +2234,7 @@
22232234
'catalog/image' => \Mage_Catalog_Helper_Image::class,
22242235
'catalog/map' => \Mage_Catalog_Helper_Map::class,
22252236
'catalog/output' => \Mage_Catalog_Helper_Output::class,
2237+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
22262238
'catalog/product' => \Mage_Catalog_Helper_Product::class,
22272239
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
22282240
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -2420,6 +2432,7 @@
24202432
'catalog/image' => \Mage_Catalog_Helper_Image::class,
24212433
'catalog/map' => \Mage_Catalog_Helper_Map::class,
24222434
'catalog/output' => \Mage_Catalog_Helper_Output::class,
2435+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
24232436
'catalog/product' => \Mage_Catalog_Helper_Product::class,
24242437
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
24252438
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -2617,6 +2630,7 @@
26172630
'catalog/image' => \Mage_Catalog_Helper_Image::class,
26182631
'catalog/map' => \Mage_Catalog_Helper_Map::class,
26192632
'catalog/output' => \Mage_Catalog_Helper_Output::class,
2633+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
26202634
'catalog/product' => \Mage_Catalog_Helper_Product::class,
26212635
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
26222636
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -2814,6 +2828,7 @@
28142828
'catalog/image' => \Mage_Catalog_Helper_Image::class,
28152829
'catalog/map' => \Mage_Catalog_Helper_Map::class,
28162830
'catalog/output' => \Mage_Catalog_Helper_Output::class,
2831+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
28172832
'catalog/product' => \Mage_Catalog_Helper_Product::class,
28182833
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
28192834
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
@@ -3011,6 +3026,7 @@
30113026
'catalog/image' => \Mage_Catalog_Helper_Image::class,
30123027
'catalog/map' => \Mage_Catalog_Helper_Map::class,
30133028
'catalog/output' => \Mage_Catalog_Helper_Output::class,
3029+
'catalog/price' => \Mage_Catalog_Helper_Price::class,
30143030
'catalog/product' => \Mage_Catalog_Helper_Product::class,
30153031
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
30163032
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,

‎.phpstorm.meta.php/magento_models.meta.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
'adminhtml/system_config_backend_gatewayurl' => \Mage_Adminhtml_Model_System_Config_Backend_Gatewayurl::class,
143143
'adminhtml/system_config_backend_image' => \Mage_Adminhtml_Model_System_Config_Backend_Image::class,
144144
'adminhtml/system_config_backend_image_favicon' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Favicon::class,
145+
'adminhtml/system_config_backend_image_logo' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Logo::class,
145146
'adminhtml/system_config_backend_image_pdf' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Pdf::class,
146147
'adminhtml/system_config_backend_layer_children' => \Mage_Adminhtml_Model_System_Config_Backend_Layer_Children::class,
147148
'adminhtml/system_config_backend_locale' => \Mage_Adminhtml_Model_System_Config_Backend_Locale::class,
@@ -3309,6 +3310,7 @@
33093310
'adminhtml/system_config_backend_gatewayurl' => \Mage_Adminhtml_Model_System_Config_Backend_Gatewayurl::class,
33103311
'adminhtml/system_config_backend_image' => \Mage_Adminhtml_Model_System_Config_Backend_Image::class,
33113312
'adminhtml/system_config_backend_image_favicon' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Favicon::class,
3313+
'adminhtml/system_config_backend_image_logo' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Logo::class,
33123314
'adminhtml/system_config_backend_image_pdf' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Pdf::class,
33133315
'adminhtml/system_config_backend_layer_children' => \Mage_Adminhtml_Model_System_Config_Backend_Layer_Children::class,
33143316
'adminhtml/system_config_backend_locale' => \Mage_Adminhtml_Model_System_Config_Backend_Locale::class,

0 commit comments

Comments
 (0)