pluf2 Commit Details

Date:

2011-05-24 18:07:19 (13 years 6 months ago)

Author:

Thomas Keller

Branch:

master

Commit:

397226475e85086523bb549e8ea7127f4db680c5

Parents:

7d1e4b9ea5eb32cb93d709d383d62aab831f1272

Message:

Fix issue 642

Changes:

File differences

-29
30 30
31 31
32 
32
33
33 34
34 35
35 36
... ...
174 175
175 176
176 177
178
179
177 180
178 181
179 182
+    exit(1);␊
}␊
set_include_path(get_include_path().PATH_SEPARATOR.dirname(__FILE__));␊
require 'Pluf.php';␊
// we have to silence strict code warnings because of PEAR (see issue 642)␊
error_reporting(E_ALL & ~E_STRICT);␊
require 'Console/Getopt.php';␊
␊
global $debug;␊

    usage();␊
    die();␊
}␊
␊
require 'Pluf.php';␊
Pluf::start($what['conf']);␊
if (PHP_SAPI != 'cli' and Pluf::f('migrate_allow_web', false)) {␊
    echo('Error: This script can only be run from the command line.'."\n");␊
 ...
     exit(1);␊
 }␊
 set_include_path(get_include_path().PATH_SEPARATOR.dirname(__FILE__));␊
-require 'Pluf.php';␊
+// we have to silence strict code warnings because of PEAR (see issue 642)␊
+error_reporting(E_ALL & ~E_STRICT);␊
 require 'Console/Getopt.php';␊
 ␊
 global $debug;␊
     usage();␊
     die();␊
 }␊
+␊
+require 'Pluf.php';␊
 Pluf::start($what['conf']);␊
 if (PHP_SAPI != 'cli' and Pluf::f('migrate_allow_web', false)) {␊
     echo('Error: This script can only be run from the command line.'."\n");␊