File tree Expand file tree Collapse file tree 3 files changed +13
-4
lines changed Expand file tree Collapse file tree 3 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -3437,6 +3437,7 @@ function Z_DVAL(z : pzval) : double;
34373437end ;
34383438
34393439function Z_VARREC (z: pzval): TVarRec;
3440+ var P: zend_ustr;
34403441begin
34413442 if z = nil then
34423443 begin
@@ -3460,8 +3461,16 @@ function Z_VARREC(z: pzval): TVarRec;
34603461 Result.VExtended^ := z.value .dval;
34613462 end ;
34623463 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}
34653474 end ;
34663475 else
34673476 begin
Original file line number Diff line number Diff line change @@ -964,7 +964,7 @@ zvalue_value = record
964964 0 : (lval: zend_long);
965965 1 : (dval: double);
966966 2 : (str: record
967- val: PUTF8Char; // zend_pchar;
967+ val: zend_pchar;
968968 len: integer;
969969 end );
970970 3 : (ht: PHashTable);
Original file line number Diff line number Diff line change @@ -885,7 +885,7 @@ procedure TPHPClassMethod.SetDisplayName(const Value: string);
885885 ({ $IFDEF PHP_UNICODE} CompareText{ $ELSE} AnsiCompareText{ $ENDIF} (Value , F.Name ) = 0 ) then
886886 raise Exception.Create(' Duplicate method name' );
887887 end ;
888- FName := { $IFDEF PHP_UNICODE} LowerCase (Value ){ $ELSE} AnsiLowerCase(Value ){ $ENDIF} ;
888+ FName := { $IFDEF PHP_UNICODE} UTF8LowerCase (Value ){ $ELSE} AnsiLowerCase(Value ){ $ENDIF} ;
889889 Changed(False);
890890 end ;
891891end ;
You can’t perform that action at this time.
0 commit comments