]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Revert "Don't add redundant includedir INSTALLDIR.'/extlib/'"
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 15 Mar 2014 13:04:11 +0000 (14:04 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 15 Mar 2014 13:04:11 +0000 (14:04 +0100)
This reverts commit 31d8069779357fbcadcaf6a0852980160131f0a4.

I didn't notice any errors because I had php-pear installed. :]

scripts/commandline.inc

index 2bf1f0fc36d62f8263ac54a6c8acafb2bff56b29..d7ee1588017bbf9c35a2ace7ca2cc4f9483d6a77 100644 (file)
@@ -36,7 +36,13 @@ ini_set("max_input_time", "0");
 set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
-require_once INSTALLDIR . '/extlib/Console/Getopt.php';
+// Add extlib to our path so we can get Console_Getopt
+
+$_extra_path = array(INSTALLDIR.'/extlib/');
+
+set_include_path(implode(PATH_SEPARATOR, $_extra_path) . PATH_SEPARATOR . get_include_path());
+
+require_once 'Console/Getopt.php';
 
 // Note: $shortoptions and $longoptions should be pre-defined!