hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix new path w/ composer

Browse Source
This commit is contained in:
Romain Neutron
2012-01-05 11:54:06 +01:00
parent 74461d2e4e
commit edbd247a89
5 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Core.php
View File

@@ -358,10 +358,8 @@ class Core extends \Pimple
*/ */
public static function initAutoloads() public static function initAutoloads()
{ {
require_once __DIR__ . '/../../../vendor/twig/twig/lib/Twig/Autoloader.php';
require_once __DIR__ . '/../../../vendor/twig/extensions/lib/Twig/Extensions/Autoloader.php'; require_once __DIR__ . '/../../../vendor/twig/extensions/lib/Twig/Extensions/Autoloader.php';
\Twig_Autoloader::register();
\Twig_Extensions_Autoloader::register(); \Twig_Extensions_Autoloader::register();
$loader = new \Symfony\Component\ClassLoader\UniversalClassLoader(); $loader = new \Symfony\Component\ClassLoader\UniversalClassLoader();

5
lib/classes/Bridge/Api/Auth/Flickr.class.php
View File

@@ -9,12 +9,9 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
$new_include_path = __DIR__ . "/../../../../vendor/" . PATH_SEPARATOR . get_include_path(); $new_include_path = __DIR__ . "/../../../../../vendor/" . PATH_SEPARATOR . get_include_path();
set_include_path($new_include_path); set_include_path($new_include_path);
require_once __DIR__ . "/../../../../vendor/Phlickr/Api.php";
require_once __DIR__ . "/../../../../vendor/Phlickr/Uploader.php";
/** /**
* *
* @package Bridge * @package Bridge

2
lib/classes/DailymotionWithoutOauth2.php
View File

@@ -10,7 +10,7 @@
* *
* @author nicolas * @author nicolas
*/ */
require_once __DIR__ . '/../vendor/dailymotion-sdk-php/Dailymotion.php'; require_once __DIR__ . '/../../vendor/dailymotion/sdk/Dailymotion.php';
class DailymotionWithoutOauth2 extends Dailymotion class DailymotionWithoutOauth2 extends Dailymotion
{ {

2
lib/classes/patch/320aa.class.php
View File

@@ -85,7 +85,7 @@ class patch_320aa implements patchInterface
if($datas['name'] == 'GV_exiftool' && strpos($val, 'lib/exiftool/exiftool') !== false) if($datas['name'] == 'GV_exiftool' && strpos($val, 'lib/exiftool/exiftool') !== false)
{ {
$val = str_replace('lib/exiftool/exiftool', 'lib/vendor/exiftool/exiftool', $val); $val = str_replace('lib/exiftool/exiftool', 'vendor/alchemy/exiftool/exiftool', $val);
} }
switch ($datas['type']) switch ($datas['type'])

4
lib/classes/setup.class.php
View File

@@ -264,12 +264,12 @@ class setup
{ {
if (system_server::get_platform() == 'WINDOWS') if (system_server::get_platform() == 'WINDOWS')
{ {
$exiftool = dirname(__DIR__) . '/vendor/exiftool/exiftool.exe'; $exiftool = dirname(__DIR__) . '/../vendor/alchemy/exiftool/exiftool.exe';
$indexer = dirname(dirname(__DIR__)) . '/bin/phraseanet_indexer.exe'; $indexer = dirname(dirname(__DIR__)) . '/bin/phraseanet_indexer.exe';
} }
else else
{ {
$exiftool = dirname(__DIR__) . '/vendor/exiftool/exiftool'; $exiftool = dirname(__DIR__) . '/../vendor/alchemy/exiftool/exiftool';
$indexer = null; $indexer = null;
} }