From c911ded19b3a4756f598993a5403fd39a9dcc158 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 1 Nov 2016 12:12:00 -0700
Subject: [PATCH] Fix for 'no changes made' message.

---
 e107_admin/plugin.php          |  1 +
 e107_handlers/plugin_class.php | 16 ++++++++--------
 e107_handlers/pref_class.php   |  6 +++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 18123e33f..48a9354c7 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -1421,6 +1421,7 @@ class pluginManager{
 
 						$lan = "A newer version of [x] is available for download.";
 						e107::getMessage()->addInfo($tp->lanVars($lan,$link));
+						e107::getMessage()->addDebug("Local version: ".$plug['plugin_version']." Remote version: ".$versions[$folder]['version']);
 					}
 
 				}
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 25f642a66..2971f7f67 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -541,7 +541,7 @@ class e107plugin
 		{
 			e107::getConfig('core')->setPref('plug_installed', $p_installed);
 			$this->rebuildUrlConfig();
-			e107::getConfig('core')->save();
+			e107::getConfig('core')->save(true,false,false);
 		}
 	}
 
@@ -1113,7 +1113,7 @@ class e107plugin
 			}
 		}
 
-		e107::getConfig('core')->setPref($pref)->save();
+		e107::getConfig('core')->setPref($pref)->save(true,false,false);
 
 		//	 e107::getConfig()->loadData($pref, false)->save(false, true);
 	}
@@ -1246,7 +1246,7 @@ class e107plugin
 		}
 
 		e107::getConfig('core')->setPref($pref);
-		e107::getConfig('core')->save();
+		e107::getConfig('core')->save(true,false,false);
 
 	}
 
@@ -1311,7 +1311,7 @@ class e107plugin
 				unset($search_prefs['comments_handlers'][$eplug_folder]);
 			}
 
-		e107::getConfig('search')->setPref($search_prefs)->save();
+	//	e107::getConfig('search')->setPref($search_prefs)->save(true,false,false);
 
 	}
 
@@ -1370,7 +1370,7 @@ class e107plugin
 		//$s_prefs = $tp -> toDB($notify_prefs);
 		//$s_prefs = e107::getArrayStorage()->WriteArray($s_prefs);
 		//e107::getDb() -> db_Update("core", "e107_value='".$s_prefs."' WHERE e107_name='notify_prefs'");
-		$notify_prefs->save(false);
+		$notify_prefs->save(false,false,false);
 	}
 
 	/**
@@ -1388,12 +1388,12 @@ class e107plugin
 		$aliases = eRouter::adminSyncAliases(e107::getPref('url_aliases'), $config); // rebuild aliases
 			
 		// set new values, changes should be saved outside this methods
-		e107::getConfig()
+	/*	e107::getConfig()
 			->set('url_aliases', $aliases)
 			->set('url_config', $config)
 			->set('url_modules', $modules)
 			->set('url_locations', $locations);
-				
+			*/
 		eRouter::clearCache();
 	}
 
@@ -2133,7 +2133,7 @@ class e107plugin
 	
 		if($updated === true)
 		{
-			$core->save();	//FIXME do this quietly without an s-message
+			$core->save(true,false,false);	//FIXME do this quietly without an s-message
 		}
 	
 	}
diff --git a/e107_handlers/pref_class.php b/e107_handlers/pref_class.php
index 3ea282e7f..770f3f73d 100644
--- a/e107_handlers/pref_class.php
+++ b/e107_handlers/pref_class.php
@@ -530,7 +530,11 @@ class e_pref extends e_front_model
 
 		if(!$this->data_has_changed && !$force)
 		{
-			e107::getMessage()->addInfo(LAN_SETTINGS_NOT_SAVED_NO_CHANGES_MADE, $this->prefid, $session_messages)->moveStack($this->prefid);
+			if($session_messages !== false)
+			{
+				e107::getMessage()->addInfo(LAN_SETTINGS_NOT_SAVED_NO_CHANGES_MADE, $this->prefid, $session_messages)->moveStack($this->prefid);
+			}
+
 			return 0;
 		}