Merge branch 'release-2.2.2-b2'

archetyped · Feb 27, 2014 · 2778ec2 · 2778ec2
2 parents c3359cb + 3916797
commit 2778ec2
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 117 deletions.
diff --git a/client/config.rb b/client/config.rb
diff --git a/controller.php b/controller.php
@@ -182,7 +182,7 @@ public function _hooks_init() {
 			add_filter('the_content', $this->m('gallery_unwrap'), $priority + 1);
 
 			//Widgets
-			add_filter('dynamic_sidebar_params', $this->m('widget_process_setup'), 20);
+			add_filter('dynamic_sidebar_params', $this->m('widget_process_setup'), PHP_INT_MAX);
 		}
 	}
 

diff --git a/includes/class.base_collection.php b/includes/class.base_collection.php
@@ -337,13 +337,13 @@ protected function get_meta($item, $meta_key = null) {
 	function build($build_vars = array()) {
 		//Parse vars
 		$this->parse_build_vars($build_vars);
-		$this->util->do_action_ref_array('build_init', array(&$this));
+		$this->util->do_action_ref_array('build_init', array($this));
 		//Pre-build output
-		$this->util->do_action_ref_array('build_pre', array(&$this));
+		$this->util->do_action_ref_array('build_pre', array($this));
 		//Build groups
 		$this->build_groups();
 		//Post-build output
-		$this->util->do_action_ref_array('build_post', array(&$this));
+		$this->util->do_action_ref_array('build_post', array($this));
 	}
 
 	/**

diff --git a/includes/class.field_base.php b/includes/class.field_base.php
@@ -491,7 +491,7 @@ function get_data($context = '', $top = true) {
 		}
 		$top = !!$top;
 		$obj =& $this;
-		$obj_path = array(&$this);
+		$obj_path = array($this);
 		$path = array();
 		if ( $top ) {
 			//Iterate through hiearchy to get top-most object

diff --git a/includes/class.field_collection.php b/includes/class.field_collection.php
@@ -383,11 +383,11 @@ function build_items($group = null) {
 			return false;
 		}
 
-		$this->util->do_action_ref_array('build_items_pre', array(&$this));
+		$this->util->do_action_ref_array('build_items_pre', array($this));
 		foreach ( $items as $item ) {
 			$item->build();
 		}
-		$this->util->do_action_ref_array('build_items_post', array(&$this));
+		$this->util->do_action_ref_array('build_items_post', array($this));
 	}
 
 	/* Group */
@@ -646,7 +646,7 @@ function &get_groups($opts = array()) {
 	 * @uses self::build_vars to determine groups to build
 	 */
 	function build_groups() {
-		$this->util->do_action_ref_array('build_groups_pre', array(&$this));
+		$this->util->do_action_ref_array('build_groups_pre', array($this));
 
 		//Get groups to build
 		$groups = ( !empty($this->build_vars['groups']) ) ? $this->build_vars['groups'] : array_keys($this->get_groups(array('sort' => 'priority')));
@@ -661,7 +661,7 @@ function build_groups() {
 			}
 		}
 
-		$this->util->do_action_ref_array('build_groups_post', array(&$this));
+		$this->util->do_action_ref_array('build_groups_post', array($this));
 	}
 
 	/**
@@ -678,13 +678,13 @@ function build_group($group) {
 		}
 
 		//Pre action
-		$this->util->do_action_ref_array('build_group_pre', array(&$this, $group));
+		$this->util->do_action_ref_array('build_group_pre', array($this, $group));
 
 		//Build items
 		$this->build_items($group);
 
 		//Post action
-		$this->util->do_action_ref_array('build_group_post', array(&$this, $group));
+		$this->util->do_action_ref_array('build_group_post', array($this, $group));
 	}
 
 	/* Collection */
@@ -696,13 +696,13 @@ function build_group($group) {
 	function build($build_vars = array()) {
 		//Parse vars
 		$this->parse_build_vars($build_vars);
-		$this->util->do_action_ref_array('build_init', array(&$this));
+		$this->util->do_action_ref_array('build_init', array($this));
 		//Pre-build output
-		$this->util->do_action_ref_array('build_pre', array(&$this));
+		$this->util->do_action_ref_array('build_pre', array($this));
 		//Build groups
 		$this->build_groups();
 		//Post-build output
-		$this->util->do_action_ref_array('build_post', array(&$this));
+		$this->util->do_action_ref_array('build_post', array($this));
 	}
 
 	/**

diff --git a/includes/class.field_type.php b/includes/class.field_type.php
@@ -353,9 +353,9 @@ function get_placeholder_defaults() {
 	 * @param string $data Data to pass to layout
 	 */
 	function build($layout = null, $data = null) {
-		$this->util->do_action_ref_array('build_pre', array(&$this));
+		$this->util->do_action_ref_array('build_pre', array($this));
 		echo $this->build_layout($layout, $data);
-		$this->util->do_action_ref_array('build_post', array(&$this));
+		$this->util->do_action_ref_array('build_post', array($this));
 	}
 
 	/**

diff --git a/includes/class.fields.php b/includes/class.fields.php
@@ -123,10 +123,10 @@ function register_types() {
 		$this->add($span);
 
 		//Enable plugins to modify (add, remove, etc.) field types
-		$this->util->do_action_ref_array('register_fields', array(&$this), false);
+		$this->util->do_action_ref_array('register_fields', array($this), false);
 
 		//Signal completion of field registration
-		$this->util->do_action_ref_array('fields_registered', array(&$this), false);
+		$this->util->do_action_ref_array('fields_registered', array($this), false);
 	}
 
 	/* Placeholder handlers */
@@ -143,10 +143,10 @@ function register_placeholders() {
 		$this->register_placeholder('checked', $this->m('process_placeholder_checked'));
 
 		//Allow other code to register placeholders
-		$this->util->do_action_ref_array('register_field_placeholders', array(&$this), false);
+		$this->util->do_action_ref_array('register_field_placeholders', array($this), false);
 
 		//Signal completion of field placeholder registration
-		$this->util->do_action_ref_array('field_placeholders_registered', array(&$this), false);
+		$this->util->do_action_ref_array('field_placeholders_registered', array($this), false);
 	}
 
 	/**

diff --git a/includes/class.options.php b/includes/class.options.php
@@ -231,7 +231,7 @@ function get_field_elements() {
 	 * @param SLB_Fields $fields Reference to global fields object
 	 * @return void
 	 */
-	function register_fields(&$fields) {
+	function register_fields($fields) {
 		//Layouts
 		$o = $this->get_field_elements();
 		$l =& $o->layout;
@@ -277,7 +277,7 @@ function register_fields(&$fields) {
 	 * @param object $fields Collection of default field types
 	 * @return void
 	 */
-	function set_parents(&$fields) {
+	function set_parents($fields) {
 		if ( !is_admin() )
 			return false;
 		$items =& $this->get_items();

diff --git a/main.php b/main.php
@@ -3,7 +3,7 @@
 Plugin Name: Simple Lightbox
 Plugin URI: http://archetyped.com/tools/simple-lightbox/
 Description: The highly customizable lightbox for WordPress
-Version: 2.2.2-b1 (BETA)
+Version: 2.2.2-b2 (BETA)
 Author: Archetyped
 Author URI: http://archetyped.com
 Support URI: https://github.com/archetyped/simple-lightbox/wiki/Reporting-Issues

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-lightbox",
-  "version": "2.2.2-b1",
+  "version": "2.2.2-b2",
   "title": "Simple Lightbox",
   "description": "The highly-customizable lightbox for WordPress",
   "author": "Sol Marchessault <sol@archetyped.com>",

diff --git a/readme.txt b/readme.txt
@@ -56,6 +56,10 @@ Get more information on [Simple Lightbox's official page](http://archetyped.com/
 3. Dark Theme
 
 == Changelog ==
+= 2.2.2-b2 =
+* Optimize: Widget processing
+* Optimize: Remove call-time-pass-by-references
+
 = 2.2.2-b1 =
 * Optimize: Widget processing
 

diff --git a/themes/baseline/config.rb b/themes/baseline/config.rb
diff --git a/themes/black/config.rb b/themes/black/config.rb
diff --git a/themes/default/config.rb b/themes/default/config.rb