Skip to content

Commit

Permalink
Merge branch '0.7.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
boonebgorges committed Feb 3, 2014
2 parents b259dba + bca1479 commit 2e9acaf
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion anthologize.php
Expand Up @@ -31,7 +31,7 @@
session_start();

if ( ! defined( 'ANTHOLOGIZE_VERSION' ) )
define( 'ANTHOLOGIZE_VERSION', '0.7.2' );
define( 'ANTHOLOGIZE_VERSION', '0.7.3' );

if ( ! class_exists( 'Anthologize' ) ) :

Expand Down
5 changes: 2 additions & 3 deletions includes/class-admin-main.php
Expand Up @@ -171,10 +171,9 @@ function dashboard_hooks() {
array( $this, 'load_admin_panel_about' )
);

// @todo Don't do this
foreach ( $plugin_pages as $plugin_page ) {
add_action( "admin_print_styles", array( $this, 'load_styles' ) );
add_action( "admin_print_scripts", array( $this, 'load_scripts' ) );
add_action( "admin_print_styles-$plugin_page", array( $this, 'load_styles' ) );
add_action( "admin_print_scripts-$plugin_page", array( $this, 'load_scripts' ) );
}

}
Expand Down
6 changes: 5 additions & 1 deletion readme.txt
Expand Up @@ -4,7 +4,7 @@ Donate link: http://anthologize.org/
Tags: book, pdf, tei, epub, publish, ebook
Requires at least: 3.3
Tested up to: 3.8.1
Stable tag: 0.7.2
Stable tag: 0.7.3

Use the power of WordPress to transform your content into a book.

Expand Down Expand Up @@ -54,6 +54,10 @@ To add your own cover images, just upload them to the anthologize/templates/epub

== Changelog ==

= 0.7.3 =
* Fix a bug in TCPDF temp image file path creation on some server setups
* Only load Anthologize scripts and styles on the proper pages, to avoid conflicts

= 0.7.2 =
* Fix a bug in TCPDF image paths on some server setups
* Fix a bug that gave access to Anthologize settings to non-admins
Expand Down
5 changes: 5 additions & 0 deletions templates/pdf/tcpdf-config.php
Expand Up @@ -49,6 +49,11 @@
define ('K_PATH_CACHE', trailingslashit( anthologize()->cache_dir ) );
define ('K_PATH_URL_CACHE', trailingslashit( anthologize()->cache_url ) );

// Create the cache dir if it doesn't exist
if ( ! file_exists( K_PATH_CACHE ) ) {
wp_mkdir_p( K_PATH_CACHE );
}

// The rest of these values are the same as TCPDF's
define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
define ('K_PATH_IMAGES', K_PATH_MAIN.'images/');
Expand Down

0 comments on commit 2e9acaf

Please sign in to comment.