Fix method visibility (Bug #13780).

horde · Jan 6, 2015 · d20f185 · d20f185
1 parent 9923572
commit d20f185
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/horde/bin/horde-import-squirrelmail-prefs b/horde/bin/horde-import-squirrelmail-prefs
@@ -86,7 +86,7 @@ class SM_Horde_Convert
      *                False if there is no horde pref equivalent, or the horde
      *                default should be used.
      */
-    private function _translate($sm_pref_name, $sm_pref_value)
+    protected function _translate($sm_pref_name, $sm_pref_value)
     {
         switch ($sm_pref_name) {
         case 'compose_new_win':
@@ -213,7 +213,7 @@ class SM_Horde_Convert
 
     /**
      */
-    private function _savePrefs($user, $basename, $prefs_cache)
+    protected function _savePrefs($user, $basename, $prefs_cache)
     {
         global $prefs, $registry;
 
@@ -270,7 +270,7 @@ class SM_Horde_Convert
 
     /**
      */
-    private function _getSignature()
+    protected function _getSignature()
     {
         return '';
     }
@@ -280,7 +280,7 @@ class SM_Horde_Convert
 
 class SM_Horde_Convert_File extends SM_Horde_Convert
 {
-    private $_files;
+    protected $_files;
 
     /**
      */
@@ -351,7 +351,7 @@ class SM_Horde_Convert_File extends SM_Horde_Convert
 
     /**
      */
-    private function _getSignature($basename, $number = 'g')
+    protected function _getSignature($basename, $number = 'g')
     {
         $sigfile = $basename . '.si' . $number;
 
@@ -365,8 +365,8 @@ class SM_Horde_Convert_File extends SM_Horde_Convert
 
 class SM_Horde_Convert_Sql extends SM_Horde_Convert
 {
-    private $_cache;
-    private $_db;
+    protected $_cache;
+    protected $_db;
 
     /**
      */
@@ -403,7 +403,7 @@ class SM_Horde_Convert_Sql extends SM_Horde_Convert
 
     /**
      */
-    private function _importPrefs($user, $prefs_cache)
+    protected function _importPrefs($user, $prefs_cache)
     {
         global $cli, $conf, $injector, $registry;
 
@@ -421,7 +421,7 @@ class SM_Horde_Convert_Sql extends SM_Horde_Convert
 
     /**
      */
-    private function _getSignature($basename, $number = 'nature')
+    protected function _getSignature($basename, $number = 'nature')
     {
         $key = '___sig' . $number . '___';
 

diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
@@ -2,6 +2,7 @@
 v5.2.4-git
 ----------
 
+[jan] Fix horde-import-squirrelmail-prefs script (Bug #13780).
 [jan] Don't instantiate notification system for RPC requests.
 
 

diff --git a/horde/package.xml b/horde/package.xml
@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
  <notes>
+* [jan] Fix horde-import-squirrelmail-prefs script (Bug #13780).
 * [jan] Don&apos;t instantiate notification system for RPC requests.
  </notes>
  <contents>
@@ -3999,6 +4000,7 @@
    <date>2014-12-03</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
+* [jan] Fix horde-import-squirrelmail-prefs script (Bug #13780).
 * [jan] Don&apos;t instantiate notification system for RPC requests.
    </notes>
   </release>