Skip to content

Commit 0634251

Browse files
committed
Added some suggested ext-* dependencies to composer.json
1 parent 107209a commit 0634251

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@
4242
"suggest": {
4343
"phpunit/phpunit": "Needed for unittests in development.",
4444
"ext-intl": "Needed for localized datetime formatting.",
45-
"ext-curl": "Needed for better downloads."
45+
"ext-curl": "Needed for better downloads.",
46+
"ext-libxml": "Needed for XML import/export",
47+
"ext-dom": "Needed for import/export",
48+
"ext-fileinfo": "Needed for mime type determination",
49+
"ext-iconv": "Needed for money string localization",
50+
"ext-simplexml": "Needed for Update panels"
51+
4652
},
4753

4854
"repositories": [

lib/DevicePart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,10 @@ public function delete()
393393
parent::delete();
394394
}
395395

396-
public function setAttributes($new_values, $edit_message = null)
396+
public function setAttributes($new_values)
397397
{
398398
$this->current_user->tryDo(PermissionManager::DEVICE_PARTS, DevicePartPermission::EDIT);
399-
parent::setAttributes($new_values, $edit_message);
399+
parent::setAttributes($new_values);
400400
}
401401

402402

lib/Orderdetails.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ public function resetAttributes($all = false)
106106
* @throws Exception
107107
*/
108108

109-
public function setAttributes($new_values, $edit_message = null)
109+
public function setAttributes($new_values)
110110
{
111111
$this->current_user->tryDo(PermissionManager::PARTS_ORDERDETAILS, CPartAttributePermission::EDIT);
112-
parent::setAttributes($new_values, $edit_message = null);
112+
parent::setAttributes($new_values);
113113
}
114114

115115
/**

templates/nextgen/js/functions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ function addURLparam(url, param) {
2424
if (url.indexOf('?') >= 0) {
2525
url = url + "&" + param;
2626
}
27-
else {
27+
else //Else use a ?
28+
{
2829
url = url + "?" + param;
2930
}
3031
return url + hash;

0 commit comments

Comments
 (0)