File tree
19 files changed
+791
-142
lines changed- app/code/Magento
- Catalog/Controller/Product/Compare
- Cms/etc
- Newsletter/view/adminhtml/templates/preview
- Sales
- Block/Order/Info/Buttons
- Model/Rss
- Test/Unit
- Block/Order/Info/Buttons
- Model/Rss
- Sitemap
- Block/Adminhtml/Edit
- Controller/Adminhtml/Sitemap
- Model
- Test/Unit
- Controller/Adminhtml/Sitemap
- Model
- dev/tests/integration/testsuite/Magento
- Catalog/Controller/Product
- Cms
- Model/Wysiwyg/Images
- _files
19 files changed
+791
-142
lines changedLines changed: 7 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
| 11 | + | |
| 12 | + | |
| 13 | + | |
11 | 14 |
| |
12 | 15 |
| |
13 | 16 |
| |
14 |
| - | |
| 17 | + | |
15 | 18 |
| |
16 | 19 |
| |
17 | 20 |
| |
| |||
26 | 29 |
| |
27 | 30 |
| |
28 | 31 |
| |
| 32 | + | |
29 | 33 |
| |
30 | 34 |
| |
31 | 35 |
| |
32 | 36 |
| |
33 | 37 |
| |
34 |
| - | |
| 38 | + | |
35 | 39 |
| |
36 | 40 |
| |
37 | 41 |
| |
| |||
43 | 47 |
| |
44 | 48 |
| |
45 | 49 |
| |
| 50 | + | |
46 | 51 |
| |
47 | 52 |
| |
48 | 53 |
| |
|
Lines changed: 8 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
| 11 | + | |
| 12 | + | |
| 13 | + | |
11 | 14 |
| |
12 | 15 |
| |
13 | 16 |
| |
14 |
| - | |
| 17 | + | |
15 | 18 |
| |
| 19 | + | |
16 | 20 |
| |
17 | 21 |
| |
18 | 22 |
| |
| |||
21 | 25 |
| |
22 | 26 |
| |
23 | 27 |
| |
| 28 | + | |
24 | 29 |
| |
25 | 30 |
| |
26 | 31 |
| |
27 | 32 |
| |
28 | 33 |
| |
29 |
| - | |
| 34 | + | |
30 | 35 |
| |
31 | 36 |
| |
32 | 37 |
| |
| |||
58 | 63 |
| |
59 | 64 |
| |
60 | 65 |
| |
| 66 | + | |
61 | 67 |
| |
62 | 68 |
| |
63 | 69 |
| |
|
Lines changed: 0 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
43 | 43 |
| |
44 | 44 |
| |
45 | 45 |
| |
46 |
| - | |
47 | 46 |
| |
48 | 47 |
| |
49 | 48 |
| |
|
Lines changed: 9 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
15 | 15 |
| |
16 | 16 |
| |
17 | 17 |
| |
18 |
| - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
19 | 27 |
| |
20 | 28 |
| |
21 | 29 |
| |
|
Lines changed: 24 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
5 | 5 |
| |
6 | 6 |
| |
7 | 7 |
| |
| 8 | + | |
| 9 | + | |
| 10 | + | |
8 | 11 |
| |
9 | 12 |
| |
10 | 13 |
| |
| |||
25 | 28 |
| |
26 | 29 |
| |
27 | 30 |
| |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
28 | 36 |
| |
29 | 37 |
| |
30 | 38 |
| |
31 | 39 |
| |
32 | 40 |
| |
| 41 | + | |
33 | 42 |
| |
34 | 43 |
| |
35 | 44 |
| |
36 | 45 |
| |
37 | 46 |
| |
38 |
| - | |
| 47 | + | |
| 48 | + | |
39 | 49 |
| |
40 | 50 |
| |
41 | 51 |
| |
| 52 | + | |
| 53 | + | |
42 | 54 |
| |
43 | 55 |
| |
44 | 56 |
| |
45 | 57 |
| |
| 58 | + | |
| 59 | + | |
46 | 60 |
| |
47 | 61 |
| |
48 | 62 |
| |
| |||
51 | 65 |
| |
52 | 66 |
| |
53 | 67 |
| |
| 68 | + | |
| 69 | + | |
54 | 70 |
| |
55 | 71 |
| |
56 | 72 |
| |
| |||
88 | 104 |
| |
89 | 105 |
| |
90 | 106 |
| |
91 |
| - | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
92 | 111 |
| |
93 | 112 |
| |
94 | 113 |
| |
95 | 114 |
| |
| 115 | + | |
| 116 | + | |
96 | 117 |
| |
97 | 118 |
| |
98 | 119 |
| |
99 |
| - | |
| 120 | + | |
100 | 121 |
| |
101 | 122 |
| |
102 | 123 |
|
Lines changed: 41 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
| 9 | + | |
9 | 10 |
| |
10 | 11 |
| |
11 |
| - | |
12 |
| - | |
| 12 | + | |
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
| |||
55 | 55 |
| |
56 | 56 |
| |
57 | 57 |
| |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
58 | 63 |
| |
59 | 64 |
| |
60 | 65 |
| |
| |||
63 | 68 |
| |
64 | 69 |
| |
65 | 70 |
| |
| 71 | + | |
66 | 72 |
| |
67 | 73 |
| |
68 | 74 |
| |
| |||
71 | 77 |
| |
72 | 78 |
| |
73 | 79 |
| |
74 |
| - | |
| 80 | + | |
| 81 | + | |
75 | 82 |
| |
76 | 83 |
| |
77 | 84 |
| |
| |||
80 | 87 |
| |
81 | 88 |
| |
82 | 89 |
| |
| 90 | + | |
83 | 91 |
| |
84 | 92 |
| |
85 | 93 |
| |
| |||
96 | 104 |
| |
97 | 105 |
| |
98 | 106 |
| |
| 107 | + | |
| 108 | + | |
99 | 109 |
| |
| 110 | + | |
100 | 111 |
| |
101 | 112 |
| |
102 | 113 |
| |
| |||
108 | 119 |
| |
109 | 120 |
| |
110 | 121 |
| |
| 122 | + | |
| 123 | + | |
111 | 124 |
| |
112 | 125 |
| |
113 | 126 |
| |
| |||
121 | 134 |
| |
122 | 135 |
| |
123 | 136 |
| |
| 137 | + | |
| 138 | + | |
124 | 139 |
| |
125 | 140 |
| |
126 | 141 |
| |
| |||
129 | 144 |
| |
130 | 145 |
| |
131 | 146 |
| |
| 147 | + | |
| 148 | + | |
132 | 149 |
| |
133 | 150 |
| |
134 | 151 |
| |
| |||
137 | 154 |
| |
138 | 155 |
| |
139 | 156 |
| |
140 |
| - | |
141 |
| - | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
142 | 162 |
| |
143 | 163 |
| |
144 | 164 |
| |
| |||
154 | 174 |
| |
155 | 175 |
| |
156 | 176 |
| |
157 |
| - | |
| 177 | + | |
158 | 178 |
| |
159 | 179 |
| |
160 | 180 |
| |
161 | 181 |
| |
162 | 182 |
| |
163 | 183 |
| |
164 | 184 |
| |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
165 | 197 |
| |
166 | 198 |
| |
167 | 199 |
| |
| |||
218 | 250 |
| |
219 | 251 |
| |
220 | 252 |
| |
| 253 | + | |
| 254 | + | |
221 | 255 |
| |
222 | 256 |
| |
223 | 257 |
| |
| |||
226 | 260 |
| |
227 | 261 |
| |
228 | 262 |
| |
229 |
| - | |
| 263 | + | |
230 | 264 |
| |
231 | 265 |
| |
232 | 266 |
| |
|
0 commit comments