Permalink
Browse files

Start 1.5-dev again

* Fixed bug with Modernizr not loading in latest trunk
* Improve URL grabber regex
  • Loading branch information...
1 parent a648661 commit db324a84cec68a6e3eb1cd9c3f9df2e260e5041a @jayj committed Aug 9, 2012
Showing with 5 additions and 4 deletions.
  1. +4 −3 functions.php
  2. +1 −1 style.css
View
7 functions.php
@@ -21,7 +21,7 @@
*
* @package Cakifo
* @subpackage Functions
- * @version 1.4.4
+ * @version 1.5-dev
* @author Jesper Johansen <kontakt@jayj.dk>
* @copyright Copyright (c) 2011-2012, Jesper Johansen
* @link http://wpthemes.jayj.dk/cakifo
@@ -256,7 +256,7 @@ function cakifo_enqueue_script() {
* wp_enqueue_script( 'modernizr', CHILD_THEME_URI . '/js/modernizr-2.x.min.js', '', '2.x' );
* in your child theme functions.php
*/
- wp_enqueue_script( 'modernizr', THEME_URI . '/js/modernizr.js', '', '2.5.3' );
+ wp_enqueue_script( 'modernizr', THEME_URI . '/js/modernizr.js', array(), '2.5.3' );
/* jQuery */
wp_enqueue_script( 'jquery' );
@@ -970,14 +970,15 @@ function cakifo_url_grabber( $type = 'http', $content = null ) {
/* If 'href' == $type, get all URLs from <a href=""> */
if ( 'href' == $type ) {
+ // href=["']([^"']+)["']
if ( ! preg_match_all( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', $content, $matches ) )
return false;
return array_map( 'esc_url_raw', $matches[1] );
}
/* Else, get all http:// URLs (including those in <a href="">) */
- if ( ! preg_match_all( '/(http|https)\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?/', $content, $matches ) )
+ if ( ! preg_match_all( '/(https?)\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?/', $content, $matches ) )
return false;
return array_map( 'esc_url_raw', $matches[0] );
View
2 style.css
@@ -2,7 +2,7 @@
* Theme Name: Cakifo
* Theme URI: http://wpthemes.jayj.dk/cakifo
* Description: Cakifo is a nice, responsive theme built from the rock-solid Hybrid Core theme framework. With its HTML5 markup and support for all the WordPress features you love, it might be the perfect theme and a great starting point for your blog! Other features include a homepage template, content slider, post formats, improved widgets and many more useful features. Customize it with a custom background, logo and link color or use a child theme. The theme is very child theme friendly.
- * Version: 1.4.4
+ * Version: 1.5-dev
* Author: Jesper J
* Author URI: http://jayj.dk
* Tags: blue, white, one-column, two-columns, three-columns, left-sidebar, right-sidebar, custom-background, custom-header, custom-menu, custom-colors, editor-style, featured-images, post-formats, microformats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready

0 comments on commit db324a8

Please sign in to comment.