Merge branch 'trunk' of https://voight001.lesidc.com/pole-sbv into trunk

This commit is contained in:
Thibault Richy 2017-10-31 14:55:18 +01:00
commit fa387fdfd1
3 changed files with 12 additions and 1 deletions

View file

@ -47,7 +47,16 @@
<script type="text/javascript" src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
<script src="<?php bloginfo('stylesheet_directory'); ?>/js/vendor.min.js"></script>
<script src="<?php bloginfo('stylesheet_directory'); ?>/js/app.js"></script>
<script type="text/javascript">
/* Google Analytics */
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-108555037-1', 'auto');
ga('send', 'pageview');
</script>
<?php wp_footer(); ?>
</body>

View file

@ -2,7 +2,7 @@
define ('WP_CONTENT_FOLDERNAME', 'pole-sbv-content');
define( 'WP_CONTENT_DIR', ABSPATH . WP_CONTENT_FOLDERNAME); // Do not remove. Removing this line could break your site. Added by Security > Settings > Change Content Directory.
define( 'WP_CONTENT_URL', 'http://www.pole-sbv.fr/pole-sbv-content'); // Do not remove. Removing this line could break your site. Added by Security > Settings > Change Content Directory.
define( 'WP_CONTENT_URL', 'http://www.societebretonnedevolaille.fr/pole-sbv-content'); // Do not remove. Removing this line could break your site. Added by Security > Settings > Change Content Directory.
/** PATH GIT */

View file

@ -29,6 +29,8 @@ define('REVISR_GIT_PATH', 'D:/Apps/Git'); // Added by Revisr
// ---- PRODUCTION
case('www.pole-sbv.fr'):
case('www.societebretonnedevolaille.fr'):
case('societebretonnedevolaille.fr'):
if ( is_file( dirname( __FILE__ ) . '/wp-conf/wp-config-prod.php' ) ) {
require( dirname( __FILE__ ) . '/wp-conf/wp-config-prod.php' );
}