Cleanup

- merge doc comments and fix from a parallel version - remove some vestigial bits - move to RC4
geekwright · Jan 20, 2016 · 1a95159 · 1a95159
1 parent e22ad10
commit 1a95159
Show file tree

Hide file tree

Showing 9 changed files with 639 additions and 477 deletions.
diff --git a/class/gwikiPage.php b/class/gwikiPage.php
diff --git a/edit.php b/edit.php
@@ -346,7 +346,6 @@
     $title = $xoopsModule->name();
 }
 $xoopsTpl->assign('xoops_pagetitle', $title);
-$xoopsTpl->assign('icms_pagetitle', $title);
 if (!empty($message)) {
     $xoopsTpl->assign('message', htmlspecialchars($message));
 }

diff --git a/extras/gwiki.php b/extras/gwiki.php
@@ -148,6 +148,5 @@ function loadLanguage($name, $domain = '', $language = null)
 }
 $title = $pageX['title'];
 $xoopsTpl->assign('xoops_pagetitle', $title);
-$xoopsTpl->assign('icms_pagetitle', $title);
 
 include XOOPS_ROOT_PATH . '/footer.php';
diff --git a/history.php b/history.php
@@ -104,7 +104,6 @@
     $title = htmlspecialchars($xoopsModule->name());
 }
 $xoopsTpl->assign('xoops_pagetitle', $title);
-$xoopsTpl->assign('icms_pagetitle', $title);
 if (!empty($message)) {
     $xoopsTpl->assign('message', $message);
 }

diff --git a/index.php b/index.php
@@ -109,7 +109,6 @@
     $title = htmlspecialchars($xoopsModule->name());
 }
 $xoopsTpl->assign('xoops_pagetitle', $title);
-$xoopsTpl->assign('icms_pagetitle', $title);
 if (!empty($message)) {
     $xoopsTpl->assign('message', $message);
 }

diff --git a/showdiff.php b/showdiff.php
@@ -80,7 +80,6 @@
     $title = htmlspecialchars($xoopsModule->name());
 }
 $xoopsTpl->assign('xoops_pagetitle', $title);
-$xoopsTpl->assign('icms_pagetitle', $title);
 if (!empty($message)) {
     $xoopsTpl->assign('message', $message);
 }

diff --git a/sortpageset.php b/sortpageset.php
@@ -243,7 +243,6 @@ function processForm(f) {
 
 $title = _MD_GWIKI_SORT_PAGE_FORM;
 $xoopsTpl->assign('xoops_pagetitle', $title);
-$xoopsTpl->assign('icms_pagetitle', $title);
 
 $dir                = basename(__DIR__);
 $pageX['moddir']    = $dir;

diff --git a/wizard.php b/wizard.php
@@ -754,7 +754,6 @@ function chooseWizard()
 
 $title = _MD_GWIKI_WIZARD;
 $xoopsTpl->assign('xoops_pagetitle', $title);
-$xoopsTpl->assign('icms_pagetitle', $title);
 
 $xoopsTpl->assign('gwiki', $pageX);
 

diff --git a/xoops_version.php b/xoops_version.php
@@ -7,9 +7,6 @@
 $modversion['license']     = 'GNU General Public License';
 $modversion['official']    = 0; //1 indicates supported by XOOPS Dev Team, 0 means 3rd party supported
 $modversion['image']       = 'assets/images/icon.png';
-if (defined('ICMS_ROOT_PATH')) {
-    $modversion['image'] = 'assets/images/icon_big.png';
-}
 
 $modversion['dirname'] = basename(__DIR__);
 
@@ -19,23 +16,25 @@
 
 $modversion['module_website_url']  = 'geekwright.com';
 $modversion['module_website_name'] = 'geekwright, LLC';
-$modversion['module_status']       = "RC3";
-$modversion['release_date']        = '2014/02/01';
+$modversion['module_status']       = "RC4";
+$modversion['release_date']        = '2016/01/20';
 $modversion['min_php']             = '5.3.7';
 $modversion['min_xoops']           = '2.5.7';
 $modversion['system_menu']         = 1;
 $modversion['help']                = "page=help";
 
 // Tables created by the SQL file (without prefix!)
 $modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-$modversion['tables'][0]        = 'gwiki_pages';
-$modversion['tables'][]         = 'gwiki_pageids';
-$modversion['tables'][]         = 'gwiki_group_prefix';
-$modversion['tables'][]         = 'gwiki_prefix';
-$modversion['tables'][]         = 'gwiki_template';
-$modversion['tables'][]         = 'gwiki_page_images';
-$modversion['tables'][]         = 'gwiki_page_files';
-$modversion['tables'][]         = 'gwiki_pagelinks';
+$modversion['tables'] = array(
+    'gwiki_pages',
+    'gwiki_pageids',
+    'gwiki_group_prefix',
+    'gwiki_prefix',
+    'gwiki_template',
+    'gwiki_page_images',
+    'gwiki_page_files',
+    'gwiki_pagelinks',
+);
 
 // Administration tools
 $modversion['hasAdmin']   = 1;