Various small updates including fixes #3449

git-svn-id: http://dev.piwik.org/svn/trunk@7298 59fd770c-687e-43c8-a1e3-f5a4ff64c105

6 files changed, 29 insertions, 17 deletions

diff --git a/core/Updates/1.9.1-b1.php b/core/Updates/1.9.1-b2.php
index 9ebb387970..2086c6c989 100755
--- a/core/Updates/1.9.1-b1.php
+++ b/core/Updates/1.9.1-b2.php
@@ -13,7 +13,7 @@
 /**
  * @package Updates
  */
-class Piwik_Updates_1_9_1_b1 extends Piwik_Updates
+class Piwik_Updates_1_9_1_b2 extends Piwik_Updates
 {
 	static function getSql($schema = 'Myisam')
 	{
@@ -26,26 +26,30 @@ class Piwik_Updates_1_9_1_b1 extends Piwik_Updates
 	{
 		// manually remove ExampleFeedburner column
 		Piwik_Updater::updateDatabase(__FILE__, self::getSql());
-		
+
 		// remove ExampleFeedburner plugin
+		$pluginToDelete = 'ExampleFeedburner';
+		self::deletePluginFromConfigFile($pluginToDelete);
+	}
+
+	public static function deletePluginFromConfigFile($pluginToDelete)
+	{
 		$config = Piwik_Config::getInstance();
 		$config->init();
 		if (isset($config->Plugins['Plugins']))
 		{
 			$plugins = $config->Plugins['Plugins'];
-			if (($key = array_search('ExampleFeedburner', $plugins)) !== false)
-			{
+			if (($key = array_search($pluginToDelete, $plugins)) !== false) {
 				unset($plugins[$key]);
 			}
 			$config->Plugins['Plugins'] = $plugins;
-			
+
 			$pluginsInstalled = $config->PluginsInstalled['PluginsInstalled'];
-			if (($key = array_search('ExampleFeedburner', $pluginsInstalled)) !== false)
-			{
+			if (($key = array_search($pluginToDelete, $pluginsInstalled)) !== false) {
 				unset($pluginsInstalled[$key]);
 			}
 			$config->PluginsInstalled = $pluginsInstalled;
-			
+
 			$config->forceSave();
 		}
 	}
diff --git a/core/Version.php b/core/Version.php
index fc718f2ef4..8987cc5d71 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -21,5 +21,5 @@ final class Piwik_Version
 	 * Current Piwik version
 	 * @var string
 	 */
-	const VERSION = '1.9.1-b1';
+	const VERSION = '1.9.1-b2';
 }
diff --git a/misc/others/test_generateLotsVisitsWebsites.php b/misc/others/test_generateLotsVisitsWebsites.php
index 1ad78f32e6..bf614b934a 100644
--- a/misc/others/test_generateLotsVisitsWebsites.php
+++ b/misc/others/test_generateLotsVisitsWebsites.php
@@ -9,6 +9,7 @@ require_once PIWIK_INCLUDE_PATH . "/libs/PiwikTracker/PiwikTracker.php";
 
 Piwik_FrontController::getInstance()->init();
 
+// SECURITY: DO NOT DELETE THIS LINE!
 if(!Piwik_Common::isPhpCliMode()) { die("ERROR: Must be executed in CLI"); }
 
 $process = new Piwik_StressTests_CopyLogs;
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 63e1902c24..62e2b13566 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -68,7 +68,7 @@ class Piwik_Provider extends Piwik_Plugin
 		$segments =& $notification->getNotificationObject();
 		$segments[] = array(
 		        'type' => 'dimension',
-		        'category' => 'Visit',
+		        'category' => 'Visit Location',
 		        'name' => Piwik_Translate('Provider_ColumnProvider'),
 		        'segment' => 'provider',
 				'acceptedValues' => 'comcast.net, proxad.net, etc.',
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index 58877b62c9..8cd8de2168 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -174,7 +174,14 @@ vertical-align:middle;
 	</div>
 {/if}
 
-{if $isSuperUser}	
+
+{* Admin users use these values for Site Search column, when editing websites *}
+{if !$isSuperUser}
+<input type="hidden" size="15" id="globalSearchKeywordParameters" value="{$globalSearchKeywordParameters|escape:'html'}"></input>
+<input type="hidden" size="15"  id="globalSearchCategoryParameters" value="{$globalSearchCategoryParameters|escape:'html'}"></input>
+{/if}
+
+{if $isSuperUser}
 <br />
 	<a name='globalSettings'></a>
 	<h2>{'SitesManager_GlobalWebsitesSettings'|translate}</h2>
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 3d8e421892..29c8a7fd01 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -140,7 +140,7 @@ class Piwik_UserCountry extends Piwik_Plugin
 		$segments =& $notification->getNotificationObject();
 		$segments[] = array(
 			'type' => 'dimension',
-			'category' => 'Visit',
+			'category' => 'Visit Location',
 			'name' => Piwik_Translate('UserCountry_Country'),
 			'segment' => 'country',
 			'sqlSegment' => 'log_visit.location_country',
@@ -148,7 +148,7 @@ class Piwik_UserCountry extends Piwik_Plugin
 		);
 		$segments[] = array(
 			'type' => 'dimension',
-			'category' => 'Visit',
+			'category' => 'Visit Location',
 			'name' => Piwik_Translate('UserCountry_Continent'),
 			'segment' => 'continent',
 			'sqlSegment' => 'log_visit.location_country',
@@ -157,7 +157,7 @@ class Piwik_UserCountry extends Piwik_Plugin
 		);
 		$segments[] = array(
 			'type' => 'dimension',
-			'category' => 'visit',
+			'category' => 'Visit Location',
 			'name' => Piwik_Translate('UserCountry_Region'),
 			'segment' => 'region',
 			'sqlSegment' => 'log_visit.location_region',
@@ -165,7 +165,7 @@ class Piwik_UserCountry extends Piwik_Plugin
 		);
 		$segments[] = array(
 			'type' => 'dimension',
-			'category' => 'visit',
+			'category' => 'Visit Location',
 			'name' => Piwik_Translate('UserCountry_City'),
 			'segment' => 'city',
 			'sqlSegment' => 'log_visit.location_city',
@@ -173,7 +173,7 @@ class Piwik_UserCountry extends Piwik_Plugin
 		);
 		$segments[] = array(
 			'type' => 'dimension',
-			'category' => 'visit',
+			'category' => 'Visit Location',
 			'name' => Piwik_Translate('UserCountry_Latitude'),
 			'segment' => 'lat',
 			'sqlSegment' => 'log_visit.location_latitude',
@@ -181,7 +181,7 @@ class Piwik_UserCountry extends Piwik_Plugin
 		);
 		$segments[] = array(
 			'type' => 'dimension',
-			'category' => 'visit',
+			'category' => 'Visit Location',
 			'name' => Piwik_Translate('UserCountry_Longitude'),
 			'segment' => 'long',
 			'sqlSegment' => 'log_visit.location_longitude',