Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

include/admin/tpl/templates.inc.tpl

@@ -18,7 +18,7 @@
     {if $adminAction == "configure"}
         <div class="serendipityAdminMsgSuccess">
             <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
-            {$CONST:DONE}: {$save_time}
+            {$CONST.DONE}: {$save_time}
         </div>
     {/if}
 

include/plugin_api.inc.php

@@ -1577,7 +1577,7 @@ class serendipity_plugin
             $tfile = dirname($this->pluginFile) . '/' . $filename;
         }
 
-        if( !SMARTY_VERSION ) { 
+        if( !defined('Smarty::SMARTY_VERSION') ) {
             $inclusion = $serendipity['smarty']->security_settings[@INCLUDE_ANY];
             $serendipity['smarty']->security_settings[@INCLUDE_ANY] = true;
             $content = $serendipity['smarty']->fetch('file:'. $tfile);