Skip to content

Commit

Permalink
about page pictures/data change
Browse files Browse the repository at this point in the history
  • Loading branch information
bak11004 committed Apr 8, 2016
1 parent cf78296 commit 9756dbe
Show file tree
Hide file tree
Showing 87 changed files with 6,810 additions and 1,538 deletions.
4 changes: 3 additions & 1 deletion www/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule . /index.php [L]
</IfModule>

php_value upload_max_filesize 64M
php_value post_max_size 64M
php_value memory_limit 64M
# END WordPress
23 changes: 14 additions & 9 deletions www/wp-content/plugins/advanced-custom-fields/acf.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: Advanced Custom Fields
Plugin URI: http://www.advancedcustomfields.com/
Description: Customise WordPress with powerful, professional and intuitive fields
Version: 4.4.5
Version: 4.4.6
Author: Elliot Condon
Author URI: http://www.elliotcondon.com/
License: GPL
Expand Down Expand Up @@ -43,7 +43,7 @@ function __construct()
'path' => apply_filters('acf/helpers/get_path', __FILE__),
'dir' => apply_filters('acf/helpers/get_dir', __FILE__),
'hook' => basename( dirname( __FILE__ ) ) . '/' . basename( __FILE__ ),
'version' => '4.4.5',
'version' => '4.4.6',
'upgrade_version' => '3.4.1',
'include_3rd_party' => false
);
Expand Down Expand Up @@ -161,15 +161,20 @@ function helpers_get_dir( $file )

function get_post_id( $post_id )
{
// set post_id to global
if( !$post_id )
{
global $post;
// if not $post_id, load queried object
if( !$post_id ) {

if( $post )
{
$post_id = intval( $post->ID );
// try for global post (needed for setup_postdata)
$post_id = (int) get_the_ID();


// try for current screen
if( !$post_id ) {

$post_id = get_queried_object();

}

}


Expand Down
2 changes: 1 addition & 1 deletion www/wp-content/plugins/advanced-custom-fields/core/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ function the_field( $field_name, $post_id = false ) {
* have_rows
*
* This function will instantiate a global variable containing the rows of a repeater or flexible content field,
* afterwhich, it will determin if another row exists to loop through
* afterwhich, it will determine if another row exists to loop through
*
* @type function
* @date 2/09/13
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ function html()
'url' => 'http://wordpress.org/extend/plugins/acf-field-date-time-picker/'
);
$free[] = array(
'title' => __("Location Field",'acf'),
'title' => __("Google Map Extended",'acf'),
'description' => __("Find addresses and coordinates of a desired location",'acf'),
'thumbnail' => $dir . 'images/add-ons/google-maps-field-thumb.jpg',
'active' => class_exists('acf_field_location'),
'url' => 'https://github.com/elliotcondon/acf-location-field/'
'active' => class_exists('acf_field_google_map_extended'),
'url' => 'https://wordpress.org/plugins/advanced-custom-fields-google-map-extended/'
);
$free[] = array(
'title' => __("Contact Form 7 Field",'acf'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ function validate_page()


// validate page
if( in_array( $pagenow, array( 'edit-tags.php', 'profile.php', 'user-new.php', 'user-edit.php', 'media.php' ) ) )
if( in_array( $pagenow, array( 'edit-tags.php', 'term.php', 'profile.php', 'user-new.php', 'user-edit.php', 'media.php' ) ) )
{
$return = true;
}
Expand Down Expand Up @@ -275,26 +275,43 @@ function admin_menu()
$this->data['option_name'] = "shopp_category_" . $_GET['id'];
}

}
if( $pagenow == "edit-tags.php" && isset($_GET['taxonomy']) )
{
// filter
$_GET['taxonomy'] = filter_var($_GET['taxonomy'], FILTER_SANITIZE_STRING);
} elseif( $pagenow == "edit-tags.php" || $pagenow == "term.php" ) {

// vars
$taxonomy = 'post_tag';
$term_id = 0;

$this->data['page_type'] = "taxonomy";
$filter['ef_taxonomy'] = $_GET['taxonomy'];

// $_GET
if( !empty($_GET['taxonomy']) ) {

$taxonomy = filter_var($_GET['taxonomy'], FILTER_SANITIZE_STRING);

}

if( !empty($_GET['tag_ID']) ) {

$term_id = filter_var($_GET['tag_ID'], FILTER_SANITIZE_NUMBER_INT);

}


// update filter
$filter['ef_taxonomy'] = $taxonomy;


// add
$this->data['page_type'] = "taxonomy";
$this->data['page_action'] = "add";
$this->data['option_name'] = "";

if( isset($_GET['action']) && $_GET['action'] == "edit" )
{
// filter
$_GET['tag_ID'] = filter_var($_GET['tag_ID'], FILTER_SANITIZE_NUMBER_INT);

// edit
if( $term_id ) {

$this->data['page_action'] = "edit";
$this->data['option_name'] = $_GET['taxonomy'] . "_" . $_GET['tag_ID'];
$this->data['option_name'] = $taxonomy . "_" . $term_id;

}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ function admin_footer()
<p><?php _e("Absolutely <strong>no</strong> changes have been made to the database between versions 3 and 4. This means you can roll back to version 3 without any issues.",'acf'); ?></p>

<h4><?php _e("Potential Issues",'acf'); ?></h4>
<p><?php printf(__('Due to the sizable changes surounding Add-ons, field types and action/filters, your website may not operate correctly. It is important that you read the full %sMigrating from v3 to v4%s guide to view the full list of changes.','acf'),'<a href="http://www.advancedcustomfields.com/resources/getting-started/migrating-from-v3-to-v4/" target="_blank">','</a>'); ?></p>
<p><?php printf(__('Due to the sizable changes surrounding Add-ons, field types and action/filters, your website may not operate correctly. It is important that you read the full %sMigrating from v3 to v4%s guide to view the full list of changes.','acf'),'<a href="http://www.advancedcustomfields.com/resources/getting-started/migrating-from-v3-to-v4/" target="_blank">','</a>'); ?></p>

<div class="acf-alert acf-alert-error">
<p><strong><?php _e("Really Important!",'acf'); ?></strong> <?php printf(__('If you updated the ACF plugin without prior knowledge of such changes, please roll back to the latest %sversion 3%s of this plugin.','acf'),'<a href="http://wordpress.org/extend/plugins/advanced-custom-fields/developers/">','</a>'); ?></p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function wp_post_revision_fields( $return ) {
$post_id = 0;


// determin $post_id
// determine $post_id
if( isset($_POST['post_id']) )
{
$post_id = $_POST['post_id'];
Expand Down Expand Up @@ -154,7 +154,7 @@ function wp_post_revision_fields( $return ) {


// WP 3.5: left vs right
// Add a value of the revision ID (as there is no way to determin this within the '_wp_post_revision_field_' filter!)
// Add a value of the revision ID (as there is no way to determine this within the '_wp_post_revision_field_' filter!)
if( isset($_GET['action'], $_GET['left'], $_GET['right']) && $_GET['action'] == 'diff' )
{
global $left_revision, $right_revision;
Expand Down Expand Up @@ -193,7 +193,7 @@ function wp_post_revision_field( $value, $field_name, $post = null, $direction =
$post_id = 0;


// determin $post_id
// determine $post_id
if( isset($post->ID) )
{
// WP 3.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function create_field( $field )
$optgroup = false;


// determin if choices are grouped (2 levels of array)
// determine if choices are grouped (2 levels of array)
if( is_array($field['choices']) )
{
foreach( $field['choices'] as $k => $v )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ function create_options( $field )
<tr class="field_option field_option_<?php echo $this->name; ?>">
<td class="label">
<label><?php _e("Formatting",'acf'); ?></label>
<p><?php _e("Effects value on front end",'acf') ?></p>
<p><?php _e("Affects value on front end",'acf') ?></p>
</td>
<td>
<?php
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function create_options( $field )
<tr class="field_option field_option_<?php echo $this->name; ?>">
<td class="label">
<label><?php _e("Formatting",'acf'); ?></label>
<p><?php _e("Effects value on front end",'acf') ?></p>
<p><?php _e("Affects value on front end",'acf') ?></p>
</td>
<td>
<?php
Expand Down
35 changes: 23 additions & 12 deletions www/wp-content/plugins/advanced-custom-fields/js/input.js
Original file line number Diff line number Diff line change
Expand Up @@ -2272,31 +2272,36 @@ var acf = {


// validate
if( ! $fields.exists() )
{
return;
}
if( ! $fields.exists() ) return false;


// validate google
if( typeof google === 'undefined' )
{
$.getScript('https://www.google.com/jsapi', function(){
// no google
if( !acf.helpers.isset(window, 'google', 'load') ) {

// load API
$.getScript('https://www.google.com/jsapi', function(){

// load maps
google.load('maps', '3', { other_params: 'sensor=false&libraries=places', callback: function(){

$fields.each(function(){
$fields.each(function(){

acf.fields.google_map.set({ $el : $(this) }).init();

});

}});

});

return false;

}
else
{


// no maps or places
if( !acf.helpers.isset(window, 'google', 'maps', 'places') ) {

google.load('maps', '3', { other_params: 'sensor=false&libraries=places', callback: function(){

$fields.each(function(){
Expand All @@ -2306,9 +2311,15 @@ var acf = {
});

}});

return false;

}


// return
return true;

});


Expand Down
4 changes: 2 additions & 2 deletions www/wp-content/plugins/advanced-custom-fields/js/input.min.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -412,31 +412,36 @@


// validate
if( ! $fields.exists() )
{
return;
}
if( ! $fields.exists() ) return false;


// validate google
if( typeof google === 'undefined' )
{
$.getScript('https://www.google.com/jsapi', function(){
// no google
if( !acf.helpers.isset(window, 'google', 'load') ) {

// load API
$.getScript('https://www.google.com/jsapi', function(){

// load maps
google.load('maps', '3', { other_params: 'sensor=false&libraries=places', callback: function(){

$fields.each(function(){
$fields.each(function(){

acf.fields.google_map.set({ $el : $(this) }).init();

});

}});

});

return false;

}
else
{


// no maps or places
if( !acf.helpers.isset(window, 'google', 'maps', 'places') ) {

google.load('maps', '3', { other_params: 'sensor=false&libraries=places', callback: function(){

$fields.each(function(){
Expand All @@ -446,9 +451,15 @@
});

}});

return false;

}


// return
return true;

});


Expand Down
Binary file not shown.
Loading

0 comments on commit 9756dbe

Please sign in to comment.