diff options
| author | Zach Copley <zach@status.net> | 2009-10-05 10:05:43 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-10-05 10:05:43 -0700 |
| commit | 2b7d8d0c29a9b28700828db5184ed6d1dc7b1922 (patch) | |
| tree | 3dd0b4bdbbc421b155750fa77ddd38edd058d136 /install.php | |
| parent | ee207ffd8be4a7178d06ff7c6928dba3714146ec (diff) | |
| parent | 7a33125a6c05a885a7e4c6d80be4e0fe26499565 (diff) | |
Merge branch '0.9.x' into refactor-api
* 0.9.x: (23 commits)
Added hook to wrap the notice form data block
Unnecessary selector bit
Removed obsolete iphone theme (pre v0.7)
remove spurious readme from Orbited
need to show scripts at end of body in RealtimePlugin
Some changes required from Orbited debugging
Update OrbitedPlugin to work with RealtimePlugin framework
updated OrbitedPlugin to use RealtimePlugin
remove unused files for OrbitedPlugin
rename plugin
copy Comet plugin to Orbited
move scripts to just before </body>, add event for scripts that need to be in <head>
reformat Notice.php
added all them doxygens
Using CDATA for autofocus script
more doxygen
added doxygen
indent fix
better handling of y response in deleteuser.php
script to permanently delete a user
...
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/install.php b/install.php index c2a5bb29e..69f025a6a 100644 --- a/install.php +++ b/install.php @@ -1,3 +1,4 @@ + <?php /** * StatusNet - the distributed open-source microblogging tool @@ -31,7 +32,7 @@ * @author Sarven Capadisli <csarven@status.net> * @author Tom Adams <tom@holizz.com> * @license GNU Affero General Public License http://www.gnu.org/licenses/ - * @version 0.9 + * @version 0.9.x * @link http://status.net */ @@ -340,13 +341,13 @@ function checkExtension($name) if (extension_loaded($name)) { return true; } elseif (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode')) { - // dl will throw a fatal error if it's disabled or we're in safe mode. - // More fun, it may not even exist under some SAPIs in 5.3.0 or later... - $soname = $name . '.' . PHP_SHLIB_SUFFIX; - if (PHP_SHLIB_SUFFIX == 'dll') { - $soname = "php_" . $soname; - } - return @dl($soname); + // dl will throw a fatal error if it's disabled or we're in safe mode. + // More fun, it may not even exist under some SAPIs in 5.3.0 or later... + $soname = $name . '.' . PHP_SHLIB_SUFFIX; + if (PHP_SHLIB_SUFFIX == 'dll') { + $soname = "php_" . $soname; + } + return @dl($soname); } else { return false; } |