[geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.51, 1.52

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv84440/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Moved some options around: "Topics and Daily Digest" is now "Blocks" (Daily Digest is now under Miscellaneous); reordered Trackback and Pingback options


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** mysql_1.4.1_to_1.5.0.php	20 Jan 2008 16:25:40 -0000	1.51
--- mysql_1.4.1_to_1.5.0.php	20 Jan 2008 18:09:16 -0000	1.52
***************
*** 83,87 ****
      $c->add('user_login_method',array('standard' => true, 'openid' => false, '3rdparty' => false),'@select',4,6,1,320,TRUE);
      $c->add('spamx',128,'text',4,8,NULL,330,TRUE);
!     $c->add('sort_admin',TRUE,'select',7,9,1,340,TRUE);
      $c->add('language','english','text',6,11,NULL,350,TRUE);
      $c->add('locale','en_GB','text',6,10,NULL,360,TRUE);
--- 83,87 ----
      $c->add('user_login_method',array('standard' => true, 'openid' => false, '3rdparty' => false),'@select',4,6,1,320,TRUE);
      $c->add('spamx',128,'text',4,8,NULL,330,TRUE);
!     $c->add('sort_admin',TRUE,'select',3,9,1,340,TRUE);
      $c->add('language','english','text',6,11,NULL,350,TRUE);
      $c->add('locale','en_GB','text',6,10,NULL,360,TRUE);
***************
*** 142,148 ****
      $c->add('whosonline_threshold',300,'text',3,19,NULL,910,TRUE);
      $c->add('whosonline_anonymous',0,'select',3,19,0,920,TRUE);
!     $c->add('emailstories',0,'select',3,20,0,930,TRUE);
!     $c->add('emailstorieslength',1,'text',3,20,NULL,940,TRUE);
!     $c->add('emailstoriesperdefault',0,'select',3,20,0,950,TRUE);
      $c->add('allow_domains','','text',4,16,NULL,960,TRUE);
      $c->add('disallow_domains','','text',4,16,NULL,970,TRUE);
--- 142,148 ----
      $c->add('whosonline_threshold',300,'text',3,19,NULL,910,TRUE);
      $c->add('whosonline_anonymous',0,'select',3,19,0,920,TRUE);
!     $c->add('emailstories',0,'select',7,20,0,930,TRUE);
!     $c->add('emailstorieslength',1,'text',7,20,NULL,940,TRUE);
!     $c->add('emailstoriesperdefault',0,'select',7,20,0,950,TRUE);
      $c->add('allow_domains','','text',4,16,NULL,960,TRUE);
      $c->add('disallow_domains','','text',4,16,NULL,970,TRUE);
***************
*** 156,169 ****
      $c->add('title_trim_length',20,'text',3,21,NULL,1050,TRUE);
      $c->add('trackback_enabled',TRUE,'select',1,22,1,1060,TRUE);
!     $c->add('pingback_enabled',TRUE,'select',1,23,1,1070,TRUE);
!     $c->add('ping_enabled',TRUE,'select',1,23,1,1080,TRUE);
!     $c->add('trackback_code',0,'select',1,22,3,1090,TRUE);
      $c->add('multiple_trackbacks',0,'select',1,22,2,1100,TRUE);
!     $c->add('trackbackspeedlimit',300,'text',1,22,NULL,1110,TRUE);
!     $c->add('check_trackback_link',2,'select',1,22,4,1120,TRUE);
      $c->add('pingback_self',0,'select',1,23,13,1130,TRUE);
!     $c->add('pingback_excerpt',TRUE,'select',1,23,1,1140,TRUE);
!     $c->add('link_documentation',1,'select',7,9,0,1150,TRUE);
!     $c->add('link_versionchecker',1,'select',7,9,0,1160,TRUE);
      $c->add('maximagesperarticle',5,'text',1,24,NULL,1170,TRUE);
      $c->add('limitnews',10,'text',1,24,NULL,1180,TRUE);
--- 156,169 ----
      $c->add('title_trim_length',20,'text',3,21,NULL,1050,TRUE);
      $c->add('trackback_enabled',TRUE,'select',1,22,1,1060,TRUE);
!     $c->add('trackback_code',0,'select',1,22,3,1070,TRUE);
!     $c->add('trackbackspeedlimit',300,'text',1,22,NULL,1080,TRUE);
!     $c->add('check_trackback_link',2,'select',1,22,4,1090,TRUE);
      $c->add('multiple_trackbacks',0,'select',1,22,2,1100,TRUE);
!     $c->add('pingback_enabled',TRUE,'select',1,23,1,1110,TRUE);
!     $c->add('pingback_excerpt',TRUE,'select',1,23,1,1120,TRUE);
      $c->add('pingback_self',0,'select',1,23,13,1130,TRUE);
!     $c->add('ping_enabled',TRUE,'select',1,23,1,1140,TRUE);
!     $c->add('link_documentation',1,'select',3,9,0,1150,TRUE);
!     $c->add('link_versionchecker',1,'select',3,9,0,1160,TRUE);
      $c->add('maximagesperarticle',5,'text',1,24,NULL,1170,TRUE);
      $c->add('limitnews',10,'text',1,24,NULL,1180,TRUE);