Small fixes

Author: Andrew Zenin

php4DelphiD2010.dpk

@@ -38,9 +38,23 @@ requires
 
 contains
   PHPProjectWizard in 'PHPProjectWizard.pas',
+  { Components Requirements }
+  DelphiFunctions in 'DelphiFunctions.pas',
+  phpLibrary in 'phpLibrary.pas',
+  PHPCommon in 'phpCommon.pas',
+  phpFunctions in 'phpFunctions.pas',
+  ZENDTypes in 'ZENDTypes.pas',
+  phpClass in 'phpClass.pas',
+  php4delphi in 'php4delphi.pas',
+  phpModules in 'phpModules.pas',
+  phpAPI in 'phpAPI.pas',
+  ZENDAPI in 'ZENDAPI.pas',
+  PHPTypes in 'PHPTypes.pas',
+  { Components Requirements }
   php4DelphiReg in 'php4DelphiReg.pas',
   php4DelphiWeb in 'php4DelphiWeb.pas',
   phpWeb in 'phpWeb.pas',
   phpAbout in 'phpAbout.pas' { dlgAbout };
 
 end.
+

php4DelphiD2010.dproj

@@ -87,6 +87,19 @@
         <DCCReference Include="vclactnband.dcp"/>
         <DCCReference Include="vclx.dcp"/>
         <DCCReference Include="PHPProjectWizard.pas"/>
+        <DCCReference Include="DelphiFunctions.pas"/>
+        <DCCReference Include="phpLibrary.pas"/>
+        <DCCReference Include="phpCommon.pas"/>
+        <DCCReference Include="phpFunctions.pas"/>
+        <DCCReference Include="ZENDTypes.pas"/>
+        <DCCReference Include="phpClass.pas"/>
+        <DCCReference Include="php4delphi.pas"/>
+        <DCCReference Include="phpModules.pas"/>
+        <DCCReference Include="phpAPI.pas"/>
+        <DCCReference Include="ZENDAPI.pas"/>
+        <DCCReference Include="PHPTypes.pas">
+            <Form>Components Requirements</Form>
+        </DCCReference>
         <DCCReference Include="php4DelphiReg.pas"/>
         <DCCReference Include="php4DelphiWeb.pas"/>
         <DCCReference Include="phpWeb.pas"/>

php4delphi.pas

@@ -861,11 +861,11 @@ procedure delphi_error_cb(_type : integer; const error_filename : PAnsiChar;
                     error_type_str := 'Unknown error';
                end;
 
-                php_log_err(PAnsiChar(Format('PHP4DELPHI %s:  %s in %s on line %d', [error_type_str, buffer, error_filename, error_lineno])), p);
+                php_log_err(PAnsiChar(AnsiFormat('PHP4DELPHI %s:  %s in %s on line %d', [error_type_str, buffer, error_filename, error_lineno])), p);
              end;
  end;
-
-   _zend_bailout(error_filename, error_lineno);
+   if PHPLoaded then
+    _zend_bailout(error_filename, error_lineno);
 end;
 {$ENDIF}
 {$IFDEF soulengine_build}