Merge remote-tracking branch 'bb-upstream/master'

src/engine/ICE/components/options/policy.php

@@ -116,5 +116,5 @@ function ice_register_option( $args, $defaults = array() )
  */
 function ice_rename_options( $list )
 {
-	ICE_Policy::options()->registry()->rename_theme_mods( $list );
+	return ICE_Policy::options()->registry()->rename_theme_mods( $list );
 }

src/engine/ICE/loader.php

@@ -82,7 +82,7 @@ final static public function init( $ice_slug, $ice_url )
 				// add theme activation callback
 				add_action( 'load-themes.php', array( __CLASS__, 'do_activated_actions' ) );
 				// add upgrade callback
-				add_action( 'ice_theme_activated', array( __CLASS__, 'upgrade' ), 1 );
+				add_action( 'admin_init', array( __CLASS__, 'upgrade' ), 1 );
 			}
 		}
 	}

src/engine/ICE/utils/mod.php

@@ -105,7 +105,7 @@ public function refresh( $force = false )
 	/**
 	 * Saves all modifications to database.
 	 *
-	 * @return boolean
+	 * @return true
 	 */
 	public function save()
 	{
@@ -115,12 +115,10 @@ public function save()
 			set_theme_mod( $this->name, $this->mods );
 			// no longer stale
 			$this->stale = false;
-			// success
-			return true;
 		}
 
-		// no save occurred
-		return false;
+		// always return true
+		return true;
 	}
 
 	/**

src/engine/ICE/utils/upgrade.php

@@ -52,6 +52,16 @@ final public function __construct( $mod_key, $default_version = '1.0' )
 		}
 	}
 
+	/**
+	 * Return currently stored version.
+	 *
+	 * @return string
+	 */
+	final public function get_version()
+	{
+		return $this->version;
+	}
+
 	/**
 	 * Returns true if comparison of saved version to given version using given operator is successful.
 	 *
@@ -168,7 +178,7 @@ public function run()
 	 */
 	private function import_options()
 	{
-		ice_rename_options( array(
+		return ice_rename_options( array(
 			// core options
 			'infinity-core-options.text-color' => 'core.text-color',
 			'infinity-core-options.link-color' => 'core.link-color',