diff --git a/includes/oik-loader-map.php b/includes/oik-loader-map.php index f61135d..202e9b5 100644 --- a/includes/oik-loader-map.php +++ b/includes/oik-loader-map.php @@ -6,18 +6,23 @@ /** * Create the oik-loader map file for oik-loader-MU - * in the mu-plugins folder - * - * It can either be a PHP file or a CSV or something - * + * in the mu-plugins folder. * * Syntax: oikwp oik-loader.php url=blocks.wp-a2z.org * * */ -function oik_loader_csv_file() { - return WPMU_PLUGIN_DIR . '/oik-loader.csv'; +if ( !function_exists( "oik_loader_csv_file") ) { + + function oik_loader_csv_file() { + $csv_file = WPMU_PLUGIN_DIR; + $csv_file .= '/oik-loader.'; + global $blog_id; + $csv_file .= $blog_id; + $csv_file .= '.csv'; + return $csv_file; + } } function oik_loader_map() { $csv = oik_loader_csv_file(); diff --git a/includes/oik-loader-mu.php b/includes/oik-loader-mu.php index 25ee052..ebdff5c 100644 --- a/includes/oik-loader-mu.php +++ b/includes/oik-loader-mu.php @@ -39,11 +39,11 @@ } /** - * Builds the lookup index from oik-loader.csv + * Builds the lookup index from oik-loader.blog_id.csv * @return array|null */ function oik_loader_mu_build_index() { - $oik_loader_csv = dirname( __FILE__ ) . "/oik-loader.csv"; + $oik_loader_csv = oik_loader_csv_file(); $index = null; if ( file_exists( $oik_loader_csv) ) { //echo "File exists"; @@ -55,6 +55,19 @@ function oik_loader_mu_build_index() { return $index; } + //$oik_loader_csv = dirname( __FILE__ ) . "/oik-loader." . $blog_id . ".csv"; + + +function oik_loader_csv_file() { + global $blog_id; + $csv_file = WPMU_PLUGIN_DIR ; + $csv_file .= '/oik-loader.'; + + $csv_file .= $blog_id; + $csv_file .= '.csv'; + return $csv_file; +} + /** * Builds the lookup index for access by URI or post ID *