[pLog-svn] r6892 - in plugins/branches/lifetype-1.2/tidyoutput: . class/action class/tidy

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2009-05-29 09:50:11 -0400 (Fri, 29 May 2009)
New Revision: 6892

Modified:
   plugins/branches/lifetype-1.2/tidyoutput/class/action/plugintidyoutputconfigaction.class.php
   plugins/branches/lifetype-1.2/tidyoutput/class/action/plugintidyoutputupdateconfigaction.class.php
   plugins/branches/lifetype-1.2/tidyoutput/class/tidy/tidy.class.php
   plugins/branches/lifetype-1.2/tidyoutput/plugintidyoutput.class.php
Log:
namespace collision

Modified: plugins/branches/lifetype-1.2/tidyoutput/class/action/plugintidyoutputconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/tidyoutput/class/action/plugintidyoutputconfigaction.class.php	2009-05-16 02:59:09 UTC (rev 6891)
+++ plugins/branches/lifetype-1.2/tidyoutput/class/action/plugintidyoutputconfigaction.class.php	2009-05-29 13:50:11 UTC (rev 6892)
@@ -27,7 +27,7 @@
             lt_include(PLOG_CLASS_PATH . "plugins/tidyoutput/class/tidy/tidy.class.php");
                   
             $this->_view = new PluginTidyOutputConfigView($this->_blogInfo);
-            $this->_view->setValue("tidyInstalled", Tidy::isInstalled());
+            $this->_view->setValue("tidyInstalled", LTTidy::isInstalled());
 			$this->setCommonData();
             
 			return true;

Modified: plugins/branches/lifetype-1.2/tidyoutput/class/action/plugintidyoutputupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/tidyoutput/class/action/plugintidyoutputupdateconfigaction.class.php	2009-05-16 02:59:09 UTC (rev 6891)
+++ plugins/branches/lifetype-1.2/tidyoutput/class/action/plugintidyoutputupdateconfigaction.class.php	2009-05-29 13:50:11 UTC (rev 6892)
@@ -68,7 +68,7 @@
             lt_include(PLOG_CLASS_PATH . "plugins/tidyoutput/class/tidy/tidy.class.php");
                   
             $this->_view = new PluginTidyOutputConfigView($this->_blogInfo);
-            $this->_view->setValue("tidyInstalled", Tidy::isInstalled());
+            $this->_view->setValue("tidyInstalled", LTTidy::isInstalled());
 			$this->_view->setSuccessMessage($this->_locale->tr("tidyoutput_settings_saved_ok"));
 			$this->setCommonData();
 			

Modified: plugins/branches/lifetype-1.2/tidyoutput/class/tidy/tidy.class.php
===================================================================
--- plugins/branches/lifetype-1.2/tidyoutput/class/tidy/tidy.class.php	2009-05-16 02:59:09 UTC (rev 6891)
+++ plugins/branches/lifetype-1.2/tidyoutput/class/tidy/tidy.class.php	2009-05-29 13:50:11 UTC (rev 6892)
@@ -5,7 +5,7 @@
     /**
     * Tidy class.
     */
-    class Tidy extends Object
+    class LTTidy extends Object
     {
         var $_parsed;
         
@@ -13,7 +13,7 @@
         * Constructor.
         * By default sessions are stored in php files
         */
-        function Tidy()
+        function LTTidy()
         {
             $this->Object();
             $this->_parsed = false;

Modified: plugins/branches/lifetype-1.2/tidyoutput/plugintidyoutput.class.php
===================================================================
--- plugins/branches/lifetype-1.2/tidyoutput/plugintidyoutput.class.php	2009-05-16 02:59:09 UTC (rev 6891)
+++ plugins/branches/lifetype-1.2/tidyoutput/plugintidyoutput.class.php	2009-05-29 13:50:11 UTC (rev 6892)
@@ -1,7 +1,6 @@
 <?php
 
     lt_include(PLOG_CLASS_PATH . "class/plugin/pluginbase.class.php");
-    lt_include(PLOG_CLASS_PATH . "class/plugin/pluginmanager.class.php");
     
     /*
     * Plugin that offers features to return links to the next and previous articles
@@ -19,13 +18,13 @@
             
             $this->PluginBase( $source );
             $this->id = "tidyoutput";
-            $this->version = "20070323";
+            $this->version = "20090529";
 
             $this->init();
 
             lt_include(PLOG_CLASS_PATH . "plugins/tidyoutput/class/tidy/tidy.class.php");
             
-            if (Tidy::isInstalled())
+            if (LTTidy::isInstalled())
             {
                 $this->registerNotification(EVENT_PROCESS_BLOG_TEMPLATE_OUTPUT);
             }
@@ -44,7 +43,6 @@
                 $this->registerAdminAction("tidyoutput", "PluginTidyOutputConfigAction");
                 $this->registerAdminAction("tidyoutputUpdateConfig", "PluginTidyOutputUpdateConfigAction");
 
-                lt_include(PLOG_CLASS_PATH . "class/template/menu/menu.class.php");
                 $menu = &Menu::getMenu();
             
                 if (!$menu->entryExists( "/menu/adminSettings/manageOutputPlugins"))
@@ -97,7 +95,7 @@
             lt_include(PLOG_CLASS_PATH . "plugins/tidyoutput/class/tidy/tidy.class.php");
             lt_include(PLOG_CLASS_PATH . "plugins/tidyoutput/config/options.properties.php");
             
-            $tidy = new Tidy();
+            $tidy = new LTTidy();
             $tidy->setOptions($options);
             $tidy->parse($output);
             $tidy->cleanRepair();