Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly

Conflicts:
	inc/lang/hr/searchpage.txt
	inc/lang/ko/searchpage.txt

1 files changed, 12 insertions, 10 deletions

diff --git a/inc/plugin.php b/inc/plugin.php
index 95bdaee2b..fbfc0325f 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -30,18 +30,19 @@ class DokuWiki_Plugin {
      * desc   - Short description of the plugin (Text only)
      * url    - Website with more information on the plugin (eg. syntax description)
      */
-    function getInfo(){
-        $parts = explode('_',get_class($this));
-        $info  = DOKU_PLUGIN.'/'.$parts[2].'/plugin.info.txt';
+    function getInfo() {
+        $parts = explode('_', get_class($this));
+        $info = DOKU_PLUGIN . '/' . $parts[2] . '/plugin.info.txt';
         if(@file_exists($info)) return confToHash($info);
 
-        msg('getInfo() not implemented in '.get_class($this).
-               ' and '.$info.' not found.<br />This is a bug in the '.
-               $parts[2].' plugin and should be reported to the '.
-               'plugin author.',-1);
+        msg(
+            'getInfo() not implemented in ' . get_class($this) . ' and ' . $info . ' not found.<br />' .
+            'Verify you\'re running the latest version of the plugin. If the problem persists, send a ' .
+            'bug report to the author of the ' . $parts[2] . ' plugin.', -1
+        );
         return array(
-            'date'   => '0000-00-00',
-            'name'   => $parts[2].' plugin',
+            'date' => '0000-00-00',
+            'name' => $parts[2] . ' plugin',
         );
     }
 
@@ -252,10 +253,11 @@ class DokuWiki_Plugin {
      */
     function __call($name, $arguments) {
         if($name == 'render'){
+            dbg_deprecated('render_text()');
             if(!isset($arguments[1])) $arguments[1] = 'xhtml';
             return $this->render_text($arguments[0], $arguments[1]);
         }
-        trigger_error("no such method $name", E_ERROR);
+        trigger_error("no such method $name", E_USER_ERROR);
         return null;
     }