Permalink
Browse files

Merge branch 'clean-composer'

  • Loading branch information...
bcenou committed Sep 18, 2018
2 parents 88a8b3b + 98b40bf commit 5d21c7b80c015119a894c0636ddbf620f292d825
@@ -7,6 +7,7 @@
"pear/mail_mime": "^1.10",
"ezyang/htmlpurifier": "^4.9",
"roderik/pwgen-php": "^0.1.5",
"stefangabos/zebra_image": "^2.2"
"stefangabos/zebra_image": "^2.2",
"geshi/geshi": "^1.0"
}
}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -19,7 +19,7 @@
defined("DBDRIVER") || define("DBDRIVER", C::get('dbDriver', 'cfg'));
$err = error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE); // packages compat
include "vendor/autoload.php";
require_once "vendor/autoload.php";
error_reporting($err);
// connect to the database server
View
@@ -1087,7 +1087,7 @@ function send_mail($to, $body, $subject, $fromaddress, $fromname, array $docs =
// @TODO Arrêter d'utiliser PEAR !!
$err = error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE); // PEAR packages compat
if (!class_exists('Mail', false) || !class_exists('Mail_mime', false)) include 'vendor/autoload.php';
if (!class_exists('Mail', TRUE) || !class_exists('Mail_mime', TRUE)) require_once 'vendor/autoload.php';
$pear = new PEAR();
$message = new Mail_mime("\n");
@@ -1231,7 +1231,7 @@ function find_in_path($fichier)
function thumbnail($path, $width = null, $height = null)
{
global $context;
class_exists('Zebra_Image') || require_once 'vendor/autoload.php';
class_exists('Zebra_Image', TRUE) || require_once 'vendor/autoload.php';
$image_infos = pathinfo($path);
$cache_options = C::get('cacheOptions', 'cfg');
View
@@ -256,7 +256,7 @@ function loop_next($context, $funcname, $arguments)
function loop_rss($context, $funcname, $arguments)
{
defined('DIRECTORY_SEPARATOR') || define("DIRECTORY_SEPARATOR", "/");
require_once 'vendor/autoload.php';
class_exists('SimplePie', TRUE) || require_once 'vendor/autoload.php';
if (!isset ($arguments['url'])) {
if (C::get('visitor', 'lodeluser'))
trigger_error("ERROR: the loop \"rss\" requires a URL attribut", E_USER_ERROR);
@@ -805,7 +805,7 @@ function nicefilesize($lien)
function wiki($text)
{
class_exists('WikiRenderer', false) || include ('vendor/autoload.php');
class_exists('WikiRenderer', TRUE) || require_once ('vendor/autoload.php');
$wkr = new WikiRenderer();
return $wkr->render($text);
}
@@ -1722,7 +1722,7 @@ function cleanCallNotes($text)
*/
function highlight_code($text, $language='xml', $lineNumbers=true)
{
class_exists('GeSHi', false) || include C::get('sharedir', 'cfg') . "/plugins/geshi/geshi.php";
class_exists('GeSHi', TRUE) || require_once 'vendor/autoload.php';
$geshi = new GeSHi($text, $language);
if($lineNumbers)
$geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
Oops, something went wrong.

0 comments on commit 5d21c7b

Please sign in to comment.