Commit fd245b2

Lev ZeninLev Zenin

Lev Zenin

authored and

Lev Zenin

committed

Fixes

1 parent 09f6b48 commit fd245b2Copy full SHA for fd245b2

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3437,6 +3437,7 @@ function Z_DVAL(z : pzval) : double;`
`3437`	`3437`	`end;`
`3438`	`3438`
`3439`	`3439`	`function Z_VARREC(z: pzval): TVarRec;`
	`3440`	`+var P: zend_ustr;`
`3440`	`3441`	`begin`
`3441`	`3442`	`if z = nil then`
`3442`	`3443`	`begin`
`@@ -3460,8 +3461,16 @@ function Z_VARREC(z: pzval): TVarRec;`
`3460`	`3461`	`Result.VExtended^ := z.value.dval;`
`3461`	`3462`	`end;`
`3462`	`3463`	`IS_STRING: begin`
`3463`		`- Result.VType := vtWideString;`
`3464`		`- Result.VWideString := PWideChar(Z_STRVAL(z));`
	`3464`	`+ Result.VType := {$IFDEF PHP_UNICODE}vtString{$ELSE}vtAnsiString{$ENDIF};`
	`3465`	`+`
	`3466`	`+ SetLength(P, z.value.str.len);`
	`3467`	`+ Move(z.value.str.val^, P[1], z.value.str.len);`
	`3468`	`+`
	`3469`	`+ {$IFDEF PHP_UNICODE}`
	`3470`	`+ Result.VUnicodeString := Pointer(P);`
	`3471`	`+ {$ELSE}`
	`3472`	`+ Result.VAnsiString := Pointer(P);`
	`3473`	`+ {$ENDIF}`
`3465`	`3474`	`end;`
`3466`	`3475`	`else`
`3467`	`3476`	`begin`

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,7 @@ procedure TPHPClassMethod.SetDisplayName(const Value: string);`
`885`	`885`	`({$IFDEF PHP_UNICODE}CompareText{$ELSE}AnsiCompareText{$ENDIF}(Value, F.Name) = 0) then`
`886`	`886`	`raise Exception.Create('Duplicate method name');`
`887`	`887`	`end;`
`888`		`- FName := {$IFDEF PHP_UNICODE}LowerCase(Value){$ELSE}AnsiLowerCase(Value){$ENDIF};`
	`888`	`+ FName := {$IFDEF PHP_UNICODE}UTF8LowerCase(Value){$ELSE}AnsiLowerCase(Value){$ENDIF};`
`889`	`889`	`Changed(False);`
`890`	`890`	`end;`
`891`	`891`	`end;`

Comments

(0)