mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00
Code Issues Releases Wiki Activity

Plugin Builder Bootstrap3 styling fixes. PDO Mysql fix in db verification class.

Browse Source
This commit is contained in:
Cameron
2015-07-29 00:14:17 -07:00
parent 1225105324
commit 2d337c28aa
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/plugin.php
View File

@@ -2413,7 +2413,7 @@ class pluginBuilder
for ($i=0; $i < 10; $i++) for ($i=0; $i < 10; $i++)
{ {
$text .= "<div>". $text .= "<div class='form-inline'>".
$frm->text("pluginPrefs[".$i."][index]", '',40,'placeholder='.EPL_ADLAN_129)." ". $frm->text("pluginPrefs[".$i."][index]", '',40,'placeholder='.EPL_ADLAN_129)." ".
$frm->text("pluginPrefs[".$i."][value]", '',40,'placeholder='.EPL_ADLAN_130)." ". $frm->text("pluginPrefs[".$i."][value]", '',40,'placeholder='.EPL_ADLAN_130)." ".
$frm->select("pluginPrefs[".$i."][type]", $options, '', 'class=null', EPL_ADLAN_131). $frm->select("pluginPrefs[".$i."][type]", $options, '', 'class=null', EPL_ADLAN_131).
@@ -2526,7 +2526,7 @@ class pluginBuilder
{ {
$nm = $key.'-'.$type; $nm = $key.'-'.$type;
$name = "xml[$nm]"; $name = "xml[$nm]";
$size = (count($val)==1) ? 'span7' : 'span2'; $size = (count($val)==1) ? 'span7 col-md-7' : 'span2 col-md-2';
$text .= "<div class='{$size}'>".$this->xmlInput($name, $key."-". $type, vartrue($defaults[$nm]))."</div>"; $text .= "<div class='{$size}'>".$this->xmlInput($name, $key."-". $type, vartrue($defaults[$nm]))."</div>";
} }
@@ -2747,7 +2747,7 @@ $template = <<<TEMPLATE
<category>{CATEGORY_CATEGORY}</category> <category>{CATEGORY_CATEGORY}</category>
<copyright>{COPYRIGHT_COPYRIGHT}</copyright> <copyright>{COPYRIGHT_COPYRIGHT}</copyright>
<adminLinks> <adminLinks>
<link url="admin_config.php" description="{ADMINLINKS_DESCRIPTION}" icon="images/icon_32.png" iconSmall="images/icon_16.png" primary="true" >LAN_CONFIGURE</link> <link url="admin_config.php" description="{ADMINLINKS_DESCRIPTION}" icon="" iconSmall="" primary="true" >LAN_CONFIGURE</link>
</adminLinks> </adminLinks>
{PLUGINPREFS} {PLUGINPREFS}
</e107Plugin> </e107Plugin>

7
e107_handlers/db_verify_class.php
View File

@@ -701,17 +701,18 @@ class db_verify
// continue; // continue;
if(mysql_query($query)) if(e107::getDb()->gen($query) !== false)
{ {
$log->addDebug(LAN_UPDATED.' ['.$query.']'); $log->addDebug(LAN_UPDATED.' ['.$query.']');
} }
else else
{ {
$log->addWarning(LAN_UPDATED_FAILED.' ['.$query.']'); $log->addWarning(LAN_UPDATED_FAILED.' ['.$query.']');
if(mysql_errno()) $log->addWarning(e107::getDb()->getLastErrorText()); // PDO compatible.
/*if(mysql_errno())
{ {
$log->addWarning('SQL #'.mysql_errno().': '.mysql_error()); $log->addWarning('SQL #'.mysql_errno().': '.mysql_error());
} }*/
} }
} }
} }