Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Pods 1.12.2

  • Loading branch information...
commit 56e2b1376b44054eca0c71066b7c8c445776b36e 1 parent 4391418
@sc0ttkclark sc0ttkclark authored
View
8 classes/Pod.php
@@ -398,7 +398,7 @@ function pod_helper($helper, $value = null, $name = null) {
elseif (false === $content && false !== $function_or_file && isset($function_or_file['file']))
locate_template($function_or_file['file'], true, true);
elseif (false !== $content) {
- if ((!defined('PODS_DISABLE_EVAL') || PODS_DISABLE_EVAL))
+ if (!defined('PODS_DISABLE_EVAL') || !PODS_DISABLE_EVAL)
eval("?>$content");
else
echo $content;
@@ -715,7 +715,7 @@ function findRecords($orderby = '`t`.`id` DESC', $rows_per_page = 15, $where = n
'where' => $where,
'groupby' => $groupby,
'having' => $having,
- 'orderby' => '`t`.`id` DESC',
+ 'orderby' => (is_array($orderby) ? '`t`.`id` DESC' : $orderby),
'limit' => $rows_per_page,
'search' => $this->search,
'search_var' => $this->search_var,
@@ -1263,7 +1263,7 @@ function showTemplate($template, $code = null) {
*/
function parse_template_string($in) {
ob_start();
- if ((!defined('PODS_DISABLE_EVAL') || PODS_DISABLE_EVAL))
+ if (!defined('PODS_DISABLE_EVAL') || !PODS_DISABLE_EVAL)
eval("?>$in");
else
echo $in;
@@ -1298,7 +1298,7 @@ function parse_magic_tags($in) {
$value = $this->pod_helper($helper, $value, $name);
// Clean out PHP in case it exists
- $value = str_replace(array('<?php', '<?', '?>'), array('&lt;?php', '&lt;?', '?&gt;'), $value);
+ $value = str_replace(array('<' . '?php', '<' . '?', '?' .'>'), array('&lt;?php', '&lt;?', '?&gt;'), $value);
$value = apply_filters('pods_parse_magic_tags', $value, $name, $helper, $before, $after);
if (null != $value && false !== $value)
View
2  functions.php
@@ -515,7 +515,7 @@ function pods_shortcode($tags) {
// id > slug (if both exist)
$id = empty($tags['slug']) ? null : $tags['slug'];
$id = empty($tags['id']) ? $id : absint($tags['id']);
-
+
$pod = new Pod($tags['name'], $id);
$found = 0;
View
4 init.php
@@ -3,7 +3,7 @@
Plugin Name: Pods CMS Framework
Plugin URI: http://podsframework.org/
Description: Pods is a CMS framework for creating, managing, and deploying customized content types.
-Version: 1.12-rc-7
+Version: 1.12.2
Author: The Pods CMS Team
Author URI: http://podsframework.org/about/
@@ -24,7 +24,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-define('PODS_VERSION', '1.12-rc-7');
+define('PODS_VERSION', '1.12.2');
if (!defined('PODS_WP_VERSION_MINIMUM'))
define('PODS_WP_VERSION_MINIMUM', '3.1');
if (!defined('PODS_PHP_VERSION_MINIMUM'))
View
8 readme.txt
@@ -4,7 +4,7 @@ Donate link: http://podsfoundation.org/donate/
Tags: pods, cms, cck, pods ui, ui, content types, custom post types, relationships, database, framework, drupal, mysql, custom content, php
Requires at least: 3.1
Tested up to: 3.3
-Stable tag: 1.12
+Stable tag: 1.12.2
Pods is a CMS framework for creating, managing, and deploying customized content types.
@@ -65,6 +65,12 @@ OR you can just install it with WordPress by going to Plugins >> Add New >> and
== Changelog ==
+= 1.12.2 - December 14, 2011 =
+* Fixed WP 3.3 TinyMCE Editor bug with HTML tab (wouldn't save if HTML tab was active during initial form load) and other minor fixes
+
+= 1.12.1 - December 12, 2011 =
+* Fixed findRecords Order bug
+
= 1.12 - December 12, 2011 =
* Important: As with all upgrades, we take them seriously. If you experience any major issues when upgrading to this version from a previous version, immediately contact uhoh@podsframework.org and we'll help get your upgrade issue figured out (critical bugs only please)
* Security Update: AJAX API calls all utilize _wpnonce hashes, update your customized publicForm / input helper code AJAX (api.php and misc.php expect `wp_create_nonce('pods-' . $action)` usage)
View
5 ui/input_form.php
@@ -85,7 +85,8 @@ function saveForm(form_count) {
}
else if (typeof(tinyMCE) == 'object' && "desc_tinymce" == classname[1]) {
var ed = tinyMCE.get(jQuery(this).attr('id'));
- jQuery(this).val(ed.getContent());
+ if (typeof(ed) == 'object')
+ jQuery(this).val(ed.getContent());
theval = jQuery(this).val();
}
else {
@@ -150,7 +151,7 @@ function fileBrowser() {
$this->showform($this->get_pod_id(), $public_columns, $label);
?>
</div>
-<?php
+<?php
//post-form hooks
do_action('pods_post_form',$form_count,$this);
do_action("pods_post_form_{$this->datatype}",$form_count,$this);
Please sign in to comment.
Something went wrong with that request. Please try again.