Changeset 470181

Timestamp:

12/02/2011 10:59:59 AM (14 years ago)

Author:

allarem

Message:

update to 2.1.1

Location:

revision-cleaner/trunk

Files:

• readme.txt (modified) (3 diffs)
• revision-cleaner.php (modified) (8 diffs)

revision-cleaner/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.1
 Tested up to: 3.2
-Stable tag: 2.1
+Stable tag: 2.1.1
 License: GPLv2 or later
 
@@ -24 +24 @@
 3. Each user can set their own clean interval in Personal Profile.
 
-== Frequently Asked Questions ==
-
-= How can I set my Interval =
-A:In your personal profile. 
 
 
@@ -35 +31 @@
  after you've translated it please send it to wordpress(at)mengzhuo.org, and attach with po file name by what your language called in English.
 
-= Acknowledge =
+== Changelog ==
 
-== Changelog ==
+= 2.1.1 =
+* Add:delete the old setting while not valid
+* Fixed:the bug http://wordpress.org/support/topic/plugin-revision-cleaner-can-activate-the-plugin
 
 = 2.1 =

revision-cleaner/trunk/revision-cleaner.php

@@ -7 +7 @@
 Plugin URI: http://wordpress.org/extend/plugins/revision-cleaner/
 Description: Auto clean your revisions while you don't needed any more
-Version: 2.1
+Version: 2.1.1
 Author: Meng Zhuo
 Author URI: http://mengzhuo.org
@@ -29 +29 @@
 */
 //definition goes here...
-define('REVISION_CLEANER_VERSION', '2.1');
+define('REVISION_CLEANER_VERSION', '2.1.1');
 define('REVISION_CLEANER_NAME','revision-cleaner');
 define('RevC_DEBUG',FALSE);
@@ -57 +57 @@
             $Revis_Setting["neo_id"] = $admin_list[0]->ID;
         }
-        return $Revis_Setting['neo_id'];
+        if ( isset($Revis_Setting["neo_id"]) && $Revis_Setting["neo_id"] > 0   ){
+            return $Revis_Setting['neo_id'];
+        } 
+        else{
+            return 1;
+        }
+        
     }
     
@@ -63 +69 @@
         
         $neo_id = Revis_get_neo_id();
-
+        
+        
         $neo_setting = get_user_meta($neo_id,'Revis_Setting');
         if (isset($neo_setting[0])){
@@ -87 +94 @@
             }
             else{
-                if ( update_user_meta( $neo_id, 'Revis_Setting', $neo_setting) )
-                    return TRUE;
-            }
-
-        }
-        Revis_crazy_type(5,__FUNCTION__);
+                if ( update_user_meta( $neo_id, 'Revis_Setting', $neo_setting) ){
+                        return TRUE;
+                    }
+            }
+
+        }
+        Revis_crazy_type(5,__FUNCTION__.'$neo_id='.$neo_id);
     }
     
@@ -245 +253 @@
     }
     
+    function Revis_check_setting($global_setting){
+        if (is_array($global_setting)){
+            extract($global_setting);
+            if (isset($neo_id) && $neo_id > 0 ){
+                return TRUE;
+            }
+        }
+        return FALSE;
+    }
+    
     function Revis_Cleaner() {
     
@@ -250 +268 @@
     $global_setting = get_option('Revis_Setting');
             
-        if ($global_setting){
+        if ( $global_setting && Revis_check_setting($global_setting ) ){
 
             global $wpdb,$current_user;
-            
-            //----For those users immigrant from 1.2----
-            
-            if (get_option('Revis_ctop') != FALSE ){
-                    //get what is set in old version
-                    $revis_interval = get_option('Revis_interval');
-                    $revis_keeplast = get_option('Revis_keeplast');
-                    $revis_ddr = get_option('Revis_delete_draft_revision');
-                    
-                    // update it into new form
-                    $admin_setting_array = array(
-                        'interval' => $revis_interval,
-                        'keep_draft_revision' => TRUE
-                    );
-                    update_user_meta( 1, 'Revis_Setting', $user_settting_array );
-                    
-                    //delete the old version's data
-                    delete_option('Revis_interval');
-                    delete_option('Revis_ctop');
-                    delete_option('Revis_keeplast');
-                    delete_option('Revis_ctop');
-                    
-                    //set new Setting, default multi_user is FALSE
-                    $initial_array = array(
-                        'multi_user' => FALSE,
-                        'version' => REVISION_CLEANER_VERSION
-                    );
-                    add_option('Revis_Setting',$initial_array,'','no');
-                    
-                    //initial other user's setting
-                    $wp_user_search = new WP_User_Query( array( 'exclude'=>array('id'=>1) ) );
-                    $authors = $wp_user_search->get_results();
-                    if ($authors[0]->ID != 1){
-                        foreach ( $authors as $author){
-                            Revis_update_author($author->ID,FALSE,TRUE);
-                        }
-                    }
-                    else{
-                        Revis_crazy_type(6,__FUNCTION__);
-                    }
-            }
-            //-----immigrant block end-----
             
 
@@ -339 +315 @@
                     'neo_id' => $neo_id
                     );
+            delete_option('Revis_Setting');
+            delete_option('Revis_Cleaned');
             add_option('Revis_Setting',$initial_array,'','no');
             add_option('Revis_Cleaned',0,'','no');